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