[automerger skipped] Merge "ErrorProne - AdapterService - RequirePermission"...

[automerger skipped] Merge "ErrorProne - AdapterService - RequirePermission" am: 52881780 -s ours am: 2eb107e4 -s ours am: cd071b4b -s ours

am skip reason: Merged-In Id2f2c1fbf1e172547fa60c567325730295cac99b with SHA-1 c928144e is already in history

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



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