[automerger skipped] Merge 10952656 am: e13e5257dd -s ours

am skip reason: Merged-In Ice15c4aa8975e5845e606e5c3d403de14d6eaef9 with SHA-1 d32dc2000b is already in history

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

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