[automerger skipped] Merge "Removing some of the API don't have to be @SystemApi" am: b0863e0f5b am: 3507c7d8c7 -s ours
am skip reason: Change-Id Ie30efa172f93a7557fb6ef56f4daf80e958c3787 with SHA-1 d884e63e61 is in history
Change-Id: I3f81a90e806947d60fb8fe4f4856491284a43ed0
This commit is contained in: