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: 798bdd90 -s ours am: 373b53a7 -s ours am: 1d48089a -s ours am: 963c9391 -s ours" into sc-dev am: 17027f55 -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/+/13815796

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68d9187f3afbbeb1ed08b5c7dbe4cf763071322d