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

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

Change-Id: I78251a3f9dc6404b13bfedab59f1dd7ac5ac4e14