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

[automerger skipped] Merge "Remove unnecessarily @System/TestApi annotations" am: 79c47faf am: 2ff58ac9 -s ours am: 5e39e883 -s ours am: f8b56b9e -s ours am: 2cde6e07 -s ours

am skip reason: Change-Id Ie1841a670bdf6c6f4b25a1fc5deed8ec2d18cda2 with SHA-1 42bec243 is in history

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

Change-Id: Ib6d557d931d818ebd3613f9e10704543f426989e