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

Change-Id: Ibd2f4fcb800b7a48e7b9313083c88b4441d02f7c