[automerger skipped] Merge "Remove unnecessarily @System/TestApi annotations" into rvc-dev-plus-aosp am: d9bdedcf5b am: 037fe0dd am: 51cf340d -s ours

am skip reason: Change-Id Ie1841a670bdf6c6f4b25a1fc5deed8ec2d18cda2 with SHA-1 222c6510 is in history

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

Change-Id: I019761a8d0e511251ece93f4dbe8e10295463976