Merge "Transitions - Allow ->GONE to be canceled" into tm-qpr-dev am: 74fb070d am: 7814b2a1

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



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