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