[automerger skipped] Merge Android U (ab/10368041) am: 80bfff1f0e -s ours

am skip reason: Merged-In If40fe5329a6f3835d1edaebdef2ff47a947a9943 with SHA-1 5e86e4846a is already in history

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

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