Merge "Fix flicker on first fold after launcher process started" into...

Merge "Fix flicker on first fold after launcher process started" into tm-qpr-dev am: 3dc3657f am: f64c964e am: af38ede4

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



Change-Id: I91c5a5a478e02d45dc02759ef6805f0f8e150abd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>