Merge "Do not look for in-process activities if contains other process...

Merge "Do not look for in-process activities if contains other process activities" into udc-dev am: 6bed003b am: 8e0cba1e

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



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