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

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



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