Merge "Refactor merged annotations creation" am: 24f473395d am: 6ca396706d am: d4b424edeb am: 4a658e1f97 am: e18de8858f

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

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