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

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



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