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

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

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



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