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

Merge "Merge "Fix bug in activity resolving logic" into udc-dev am: c0e77909 am: dc51ebdb" into udc-d1-dev-plus-aosp am: 423cca55

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



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