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

Change-Id: Ia477082e5d884cfd90a7c7507c116559e25103f2