[automerger skipped] Fix build breakage am: 667413ea -s ours am: 6c260fac...

[automerger skipped] Fix build breakage am: 667413ea -s ours am: 6c260fac -s ours am: b3b190ec -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: If06239bed5f2df83dc7a9dec7cd78cabdf1fb2a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>