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

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



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