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: 50e42f8b am: 5dbac7a9 am: c48a6f07

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



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