Merge "Resolve compilation error in...

Merge "Resolve compilation error in android.hardware.bluetooth@1.1-service.sim" into main am: a0004a5d am: 2dcf59eb

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3455240



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