[automerger skipped] Merge "Fix fuzzer build break." am: 86ef049c -s ours...

[automerger skipped] Merge "Fix fuzzer build break." am: 86ef049c -s ours am: 0494dcbc -s ours am: aa7bb766 -s ours

am skip reason: Merged-In I99ea709fe591ca362208547051d7fd5810ed42ed with SHA-1 ae01e9b3 is already in history

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



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