[automerger skipped] Merge UP1A.230905.019 am: 70b8273014 -s ours

am skip reason: Merged-In I26c6eef24e7f909842eb066a73286a7525124d21 with SHA-1 a1c9dc6af9 is already in history

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

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