[automerger skipped] Merge "Move annotations in public api to frameworks/base"...

[automerger skipped] Merge "Move annotations in public api to frameworks/base" am: f6641012 am: fabe544f am: 818a9c58 am: a4de19e6 am: 59ba6ef9 -s ours

am skip reason: Merged-In Ide01e4e7840bddf1e024e9024771e528d17a1d80 with SHA-1 7e8b1188 is already in history

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

Change-Id: Iaf6e117806c3846922e9f3688dacb93433e805fa