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

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



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