Merge "Merge "[Unfold animation] Add a way to markScreenAsTurnedOn" into...

Merge "Merge "[Unfold animation] Add a way to markScreenAsTurnedOn" into tm-qpr-dev am: c45f351a" into tm-qpr-dev-plus-aosp am: 68a616e1

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



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