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

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



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