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

Change-Id: Iaa330703a4dd63653210f9c64898d67c78aa2760