Merge "SF: Fix jank after folding due to power sequence" into udc-qpr-dev am: 507c115d

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



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