Merge "Fix flicker when starting folding" into tm-qpr-dev am: 0efdbeff am: 65e92dec

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



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