[automerger skipped] dist annotations.zip and api-versions.xml am: 0bb7772edc -s ours am: 1e60fced14 -s ours

am skip reason: Change-Id Ice23230c57b9ed30541a6dcb6f507b765e6a03fe with SHA-1 0bb7772edc is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12089126

Change-Id: Icf367a7d431b64eeb1d213d28671d385f748324a