Merge "[automerger skipped] Prevent using invalid result uri during multi user...

Merge "[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add6 -s ours am: 94ed37da -s ours am: b21072b7 -s ours am: 4f095b1a -s ours am: cb10105f -s ours am: 4989788b -s ours" into sc-dev am: 8b747a86 -s ours

am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d5afa80499390f1bd173701d47a2f4e664f0f95