[automerger skipped] Merge "Remove unnecessarily @System/TestApi annotations" am: 288bf3c9 am: fc13dae7 -s ours am: 5a4ebf4c -s ours

am skip reason: Change-Id Ie1841a670bdf6c6f4b25a1fc5deed8ec2d18cda2 with SHA-1 171f074f is in history

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

Change-Id: I789df5921efec352568b4037c0d3507333e635d8