Merge "Adding the new activity on the same TF of the cleared activity" into tm-dev am: b4c09cd2

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



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