Merge "Fix bug in activity resolving logic" into udc-dev am: c0e77909 am: 117b967a am: a8985588 am: f050665a

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



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