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

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

Change-Id: Ia4eb17b5bd5e2eff874fecb9cd89f15cc471dd1c