Merge "Merge "Adding the new activity on the same TF of the cleared activity"...

Merge "Merge "Adding the new activity on the same TF of the cleared activity" into tm-dev am: b4c09cd2 am: 50e42f8b" into tm-d1-dev-plus-aosp am: 3c781820 am: 1ad012df

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



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