[automerger skipped] Merge "Remove annotations that have been relocated" into rvc-qpr-dev-plus-aosp am: e6269baa -s ours am: 83d4508a -s ours

am skip reason: Merged-In Ie6d4938961f7725cc141dd1a43f69a906b913f24 with SHA-1 3f0c3db1 is already in history

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

Change-Id: Idd5bcac0eeea4bf967c1bb25253df7d82092e62e