Merge "Disable face haptics during coex non-bypass by default" into sc-dev am:...

Merge "Disable face haptics during coex non-bypass by default" into sc-dev am: bf637195 am: abdf4ed8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404309

Change-Id: I14c466ee2f6250a8944b9f98e12161e115d8b3b9