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

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



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