Merge "Fix bug in activity resolving logic" into udc-dev am: c0e77909

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



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