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

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



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