Merge "Continue deferring removal of activities in a transition" into...

Merge "Continue deferring removal of activities in a transition" into tm-qpr-dev am: bab5ec4a am: 71ea608a

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



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