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

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

Change-Id: I1880484f52a1e39898d06b1ae18087ed6659a399