[automerger skipped] Merge "Revert "Disable sniff mode for Phonak device""...

[automerger skipped] Merge "Revert "Disable sniff mode for Phonak device"" into tm-dev am: 85dc4f4b -s ours am: aa6e6745 -s ours

am skip reason: Merged-In I7fdd2904bf1607bd02dc38836b5a3bac4b5d29bd with SHA-1 eba5853c is already in history

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



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