Merge "Unfreeze the surface when the transition is done" into tm-qpr-dev am:...

Merge "Unfreeze the surface when the transition is done" into tm-qpr-dev am: 5ebcaa2a am: fa63e7a0 am: 1467f98f am: 9b33a22a am: 7352f361

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



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