Merge "Merge "Update co-ex error logic" into sc-dev am: 1593d6a8 am: 32242769" into sc-v2-dev-plus-aosp am: b0a2c537

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

Change-Id: I4ef8c0300176b50f296f1920930b8cca7103b61b