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

[automerger skipped] Merge "Fix build breakage" into tm-dev am: fdb04f7f -s ours am: 9a386206 -s ours am: af8956f7 -s ours am: 3a880a7d -s ours

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

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



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