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

Change-Id: I2e634b362eb466f2efd9afa225034abcd219ba18