Merge "Add some @SystemApi tags for internal user-related APIs" into lmp-dev