[automerger skipped] Merge "SysUI co-ex updates" into sc-dev am: c4828692...

[automerger skipped] Merge "SysUI co-ex updates" into sc-dev am: c4828692 am: 174e1a67 -s ours am: 36996362 -s ours

am skip reason: skipped by user beverlyt

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

Change-Id: If58c35b11de12ff4434fcfd0f86c42e59fae95bb