Merge "Refactor merged annotations creation" am: 24f47339

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



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