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

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

Change-Id: Ie4179a756ba9175606cdb84d40eef0d9cf440365