[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 skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e 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: I3a4f9d1b918a7d406383472636f6ec519c1b5a8c