Merge "Add systemapi version of api-versions.xml and annotations.zip to dist." am: 953a521c54

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

Change-Id: Ie2c44190bc20949e40729b2804b5d7ef2fa19416