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

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

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