Merge "Fix bug in activity resolving logic" into udc-dev am: c0e7790931 am: 652133c6d9

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

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