[automerger skipped] Merge "Remove annotations that have been relocated" into sc-dev am: 82df05f9 -s ours

am skip reason: Merged-In I834b9f5320e0b6fe8cb9feb7194c82085b805e07 with SHA-1 68f38b2f is already in history

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

Change-Id: If170fef8cde1d95f97df5c6382be82362b6d885c