Merge "Fix bluetooth_hh_test build" am: 66d44917

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



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