Merge "Move annotations in public api to frameworks/base" am: f664101210

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

Change-Id: Ifcb7b8b4e186c5815b0602d22f0dbae1dbbe03b1