Merge "Fix the @RequiresPermission annotation." into tm-dev am: 83383957 am: e7282659

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



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