Merge "Remove unnecessarily @System/TestApi annotations" into rvc-dev-plus-aosp