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

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



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