Merge "hikey/hikey960: Add device admin feature" am: 2a1fc3229b
am: ae17df2860

Change-Id: Icdf71ea20c19550fdb25eb29f33983bac89855e0