Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev am: 56023af9 am: 5d933238 Change-Id: I028e1c3f4d0ea78669f2b8a4188a0d4064dfa007