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

[automerger skipped] Merge "Remove annotations that have been relocated" am: 7a622ea7 -s ours am: 1ae88c4b -s ours am: 7bb2ad33 -s ours

am skip reason: Merged-In I024252070bd806d50d54377190fdc5cd5b4445e1 with SHA-1 bda79da6 is already in history

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

Change-Id: Ife16dc0e3aab96e7bb2237e90b198dd06c95e9cd