[automerger skipped] Merge "Removing some of the API don't have to be...

[automerger skipped] Merge "Removing some of the API don't have to be @SystemApi" am: 66a82eec am: 3e114f82 -s ours am: cdea988c -s ours am: 57d99fca -s ours

am skip reason: Change-Id Ie30efa172f93a7557fb6ef56f4daf80e958c3787 with SHA-1 f68546e8 is in history

Change-Id: Ic07b5b977d78d5bb62140e7f363de4bcaf465c5e