Merge "Add a system variant of the merged annotations" am: 16d14284 am:...

Merge "Add a system variant of the merged annotations" am: 16d14284 am: 035a9295 am: b103f0d7 am: 160df6f3

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



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