[automerger skipped] Merge "DO NOT MERGE: Recover shady content:// paths." into nougat-cts-dev
am: b297934c46 -s ours
am skip reason: subject contains skip directive

Change-Id: I90d9ee153779a7f7d20f7ed31ca52aaad3e4725c