Merge "[automerger skipped] Prevent using invalid result uri during multi user image change am: 07e414017c am: 0e9cbfc86e -s ours" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
638a96896e