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