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

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



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