Merge "Add build rule to merge annotation zips" into stage-aosp-master am: f218033ccf am: 30c5351527 am: 8e00cdd0fe am: fb1757f212

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

Change-Id: Ifccb022f891dbb5b989a7330cea2baee934b0831