Merge "Upgrade RequireAPI annotation to prevent wrong lint error." am: e8d4b0ed09 am: 53a9eb7f04 am: 2cef4b559a

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

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