Merge "Fix bug in activity resolving logic" into udc-dev am: c0e77909 am: 117b967a am: 9a58a9b9 am: 47ccfeda

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



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