am 7202fd15: am f27739f7: Merge "Add some @SystemApi tags for internal user-related APIs" into lmp-dev

* commit '7202fd15a22c2f36dee702eb04f415d36882ee32':
  Add some @SystemApi tags for internal user-related APIs