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

[automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282 -s ours am: 28539c02 -s ours am: e6908215 -s ours am: fca809b4 -s ours am: 5715f430 -s ours am: a1e59f0a -s ours

am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 6746add6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38ebf7b94eeaec82c9596e08f3fe83ebf3dd971b