Merge "Always detach transition-created surfaces on finish" into udc-dev am:...

Merge "Always detach transition-created surfaces on finish" into udc-dev am: 6e8eaf28 am: 9062c004

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



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