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

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

Change-Id: Ief3567d6c02b13fa48b8a2560b92cfe88ef6ba37