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

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

Change-Id: I257a938bbff30f10e0bdfec7052ac39d3389fbd2