Merge "Fix bluetooth aidl crash" into main am: 5e80be91

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



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