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: Id4e8a9da66d73c6bff2047d04c33fd2d024d44e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>