[automerger skipped] Merge "Build flag to runtime check hf indicator" into...

[automerger skipped] Merge "Build flag to runtime check hf indicator" into tm-qpr-dev am: b6704ced am: fccd72ce -s ours

am skip reason: Merged-In Ibb81687841f4689e162f6caf31a38fca06c0ecee with SHA-1 b1fa1a95 is already in history

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



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