Merge "Refactor merged annotations creation" am: 24f47339 am: 6ca39670 am:...

Merge "Refactor merged annotations creation" am: 24f47339 am: 6ca39670 am: d4b424ed am: 4a658e1f

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



Change-Id: I9efce0ea62bdfa1990fe8e4cb6d5ede2beddc256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>