Merge "UserManager: Add new @SystemApis"