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

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

Change-Id: I243dfb3dd1f7ed3ce3f12f9eb04676bcb493ee35