Merge "Use generated merged annotations.zip in SDK build" am: ed19ee5981

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

Change-Id: I9f2bda05da53d9adab5c19f23a92f67eae74f2f7