Merge "Add build rule to merge annotation zips" am: e71f30f079 am: c075b75396

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837316

Change-Id: I9a7db429df1c25859ae1ed1821be2b4c3a466080