Merge "Code synchronization with the core Resolver" into tm-qpr-dev am: 12a53ed6fb

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

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