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

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

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