[automerger skipped] Merge "Remove annotations that have been relocated" into...

[automerger skipped] Merge "Remove annotations that have been relocated" into stage-aosp-master am: 91852757 -s ours am: affd693c -s ours

am skip reason: Merged-In Ic0ec9c3c12571b3405c1b7668528f5c50d083896 with SHA-1 1176cad7 is already in history

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

Change-Id: If9138d77c0bad64ab833ee11829878292bb7b5b7