Merge "Add build rule to merge annotation zips" into stage-aosp-master am:...

Merge "Add build rule to merge annotation zips" into stage-aosp-master am: f218033c am: 30c53515 am: 8e00cdd0 am: fb1757f2

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

Change-Id: Ifccb022f891dbb5b989a7330cea2baee934b0831