Merge "Fix build breakage" am: 74acdf71 am: ddbbff9d am: fd3ae7cd am:...

Merge "Fix build breakage" am: 74acdf71 am: ddbbff9d am: fd3ae7cd am: a93ef62c am: e9f24bba

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



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