Merge "Finish unfold transition when screen turns on after half-folded" into...

Merge "Finish unfold transition when screen turns on after half-folded" into tm-dev am: 6da0c2fc am: 82e49aaf

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



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