Merge "Fix build breakage" into tm-dev am: fdb04f7f

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



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