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: abf477a5 am: 143cb2d3

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



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