[automerger skipped] Merge "Remove unnecessarily @System/TestApi annotations"...

[automerger skipped] Merge "Remove unnecessarily @System/TestApi annotations" into rvc-dev-plus-aosp am: d9bdedcf am: d9b5b3f2 am: 079740d8 -s ours

am skip reason: Change-Id Ie1841a670bdf6c6f4b25a1fc5deed8ec2d18cda2 with SHA-1 4290301e is in history

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

Change-Id: I019761a8d0e511251ece93f4dbe8e10295463976