Merge "Follow error prone recommendation - RequirePermission" into...

Merge "Follow error prone recommendation - RequirePermission" into stage-aosp-master am: 540239b5 am: 2996f6d5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/19409107



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