Merge "Upgrade RequireAPI annotation to prevent wrong lint error." am: e8d4b0ed

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



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