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

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

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