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

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

Change-Id: If7e2a0c7be4962425cf519764efb0eeabd46eb8a