Merge "6/n: Add support for additional coex cases" into sc-dev am: e086c96b

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

Change-Id: I8b60143a8a086e2094406893240439a6f04e5f5c