[automerger skipped] [conflict resolved] Fix a security bypass issue in...

[automerger skipped] [conflict resolved] Fix a security bypass issue in access_secure_service_from_temp_bond am: 62944f39 am: ba9a1524 am: f22cd8d4 am: ebc3bf78 am: 878658a4 am: c761a259 -s ours

am skip reason: Merged-In I48df2c2d77810077e97d4131540277273d441998 with SHA-1 62944f39 is already in history

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



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