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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11971853

Change-Id: I4d20d4d8791ef481f7496fd5a6ddeea0a7642e16