Merge "Fix alternate intents in the intent refinement call." into tm-qpr-dev am: 37364423c1 am: 447f189505

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/21552780

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