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

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



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