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

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

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



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