Merge "Fix bluetooth aidl crash" into main am: 5e80be918c am: 25b01eb2c4

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2812113

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