Merge "Merge "Update co-ex error logic" into sc-dev am: 1593d6a8 am:...

Merge "Merge "Update co-ex error logic" into sc-dev am: 1593d6a8 am: 24a93078" into sc-v2-dev-plus-aosp am: 05b49a1a

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

Change-Id: I52afdda1267a1d7f08a236f613cae46bd089226e