Merge "[automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0
-s ours am: 373b53a7cc
-s ours am: 1d48089aa2
-s ours am: 963c939143
-s ours" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
17027f55bf