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: 07e41401 am: 0e9cbfc8 -s ours" into sc-dev am: 638a9689 -s ours

am skip reason: Change-Id I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6aa8f783244a8c703f68fc7256f12bde0c4939c3