[automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: d1e4324fb3 -s ours am: 21281256ff -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: I54fbe7c603f1f5d661e2b792ea04d33c520e8a70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>