Merge "[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669
-s ours am: 94ed37dacf
-s ours am: b21072b773
-s ours am: 4f095b1a6b
-s ours am: cb10105fe1
-s ours am: 4989788b15
-s ours" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
8b747a8637