Merge "hikey/hikey960: Add device admin feature"