Merge "Revert "Upgrade RequireAPI annotation to prevent wrong lint error."" am: 92bfdc6b

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



Change-Id: I68c5e5a7aa89f6406864bb8c266818129cf6394e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>