[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 am: 136124fb -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: I7ac343db234f89fadf50e34344205e891c4cf8df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>