Merge "fix for exception" into main am: e0d0fb91 am: b16377dc

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



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