Merge "Don't collect redundant activities in transient launch" into udc-dev am: 158198dd am: 4c5ee64c

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



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