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

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

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