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

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



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