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

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

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

Change-Id: I8a3108fda03c650086c16cc650e50b71c0876cb2