[automerger skipped] Merge "Add SCREEN_STATE flags to QuickStepContract" into tm-qpr-dev am: 39bbb9c0fb am: b091de5a87 -s ours
am skip reason: Merged-In Iae8df1f1c4654f37db9a0ec450aa0516405769bc with SHA-1 f39bb6a115 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21701403
Change-Id: I42e1a4f52e4d29dcddf3585744851a82e1e4391d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: