[automerger skipped] Merge "Remove annotations that have been relocated" am: 7a622ea7eb -s ours
am skip reason: Merged-In I024252070bd806d50d54377190fdc5cd5b4445e1 with SHA-1 bda79da64b is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692855
Change-Id: I1ba5e702bf3e8be192a29098b18dc3d165144194
This commit is contained in: