Merge "Merge "Fix bug in activity resolving logic" into udc-dev am: c0e77909 am: dc51ebdb" into udc-d1-dev-plus-aosp am: 423cca55 am: d9dd04a2

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



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