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

Change-Id: I8bdbed5b18319b715beaf1c03974fae58efc6170