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: 10d0ee9e am: c3b006d9" into tm-qpr-dev-plus-aosp am: d94c2b72

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



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