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

[conflict resolved] Fix a security bypass issue in access_secure_service_from_temp_bond am: 62944f39 am: ba9a1524 am: f22cd8d4 am: ebc3bf78 am: 878658a4

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



Merged-In: I48df2c2d77810077e97d4131540277273d441998

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