[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 -s ours am: 4faca326 -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: Id111b032e2e17bc0d8e99101a19a662d86e87c37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>