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

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

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



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