Merge "Update error haptics for coex" into sc-dev am: 15fd1a115c

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

Change-Id: I103ef9ada205bcabb3e51cccb7e35969aa8842a8