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

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

Change-Id: Ifc94eb11e5766769f79b58b277ca599f5ea5a689