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

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

Change-Id: If4a7705a4830e84e4381892728cc9c51e2f93dd0