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

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



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