Revert "BT: Multi HF support in Settings App."

This reverts commit 7bbd90528064516a4aae200731a7fd60acd09192.
Revert "BT: Multi HF support in Settings App."

This reverts commit 7bbd90528064516a4aae200731a7fd60acd09192.
Merge branch 'cm-11.0' into kk_mkt