[automerger skipped] Merge "Remove custom annotation libs" am: 355f8c28 am:...

[automerger skipped] Merge "Remove custom annotation libs" am: 355f8c28 am: a056f69a am: 45e3d62d -s ours

am skip reason: skip tag Change-Id I4583da7bf5849783d6c5e88a762e04a8fe3e8760 with SHA-1 31df3e6e is already in history

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

Change-Id: I98f03bba691b32d9ceafb6be431f7ba9887dcb6b