[automerger skipped] Merge "Fix build breakage" into tm-dev am: fdb04f7f am:...

[automerger skipped] Merge "Fix build breakage" into tm-dev am: fdb04f7f am: 716bf6ba -s ours am: cb1aa05c -s ours am: 8084824f -s ours

am skip reason: Merged-In I85610dc0464bc1b1d9b84529611e385a36720276 with SHA-1 667413ea is already in history

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



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