Merge "Add a tool for merging annotation.zip files" am: 0e4260d7 am:...

Merge "Add a tool for merging annotation.zip files" am: 0e4260d7 am: b370ca08 am: 7ccd3666 am: 0d084d89

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

Change-Id: I9ece898b168f897ba56a853444c333722477a70e