Merge "Change some UserManager APIs to @SystemApi"