[automerger skipped] Merge "fix merge conflicts - SysUI co-ex updates" into sc-v2-dev-plus-aosp am: ab666a6a -s ours

am skip reason: Merged-In Ied977fec9009265dac89b7e24c1075ceb2905bfd with SHA-1 f2e79595 is already in history

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

Change-Id: Ic717b9d24fbb0b6fc1c6e88e6a784aba3ddf8a4a