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