Merge "Revert "Add build rule to merge annotation zips"" into...

Merge "Revert "Add build rule to merge annotation zips"" into stage-aosp-master am: 47456591 am: 59e08f24

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

Change-Id: I61e10eb398ca2814b2a297ebbe36aaac07d697a7