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: c6563ad8 am: 9b47915b am: 7fe2457c am: 46ea3db5

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



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