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

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



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