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: 9a58a9b9

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



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