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

Merge "Move annotations in public api to frameworks/base" am: f6641012 am: fabe544f am: 818a9c58 am: a4de19e6

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

Change-Id: Ic0e3ce6f6f793f8e1d06ece68a982b988a52c710