[automerger skipped] Merge "SysUI co-ex updates" into sc-dev am: c482869205 am: df66e0cf79 -s ours
am skip reason: Merged-In Ied977fec9009265dac89b7e24c1075ceb2905bfd with SHA-1 8a82103b2e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15312413
Change-Id: I0b8bb4b27ed8584c4ebda28ebe8966c31ec74a3e
This commit is contained in: