Merge "Resolve compilation error in...

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

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



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