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 am: a851ce90

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



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