Merge "dist annotations.zip and api-versions.xml" am: 59d6611224 am: 83a846f398 am: 9f073397c3

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

Change-Id: I0c5505eccdf46ea3e87cb73c7b40f7b6368a0aad