[automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am: ab80221a8c am: 893598cd4b
am: 7656e1177f  -s ours

Change-Id: I95387eef7f018aceec664807c015eef768fbb4b3