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

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

Change-Id: I85808a337c453675f96b7bfb65270dfc6a7ffd56