Merge "DO NOT MERGE: Recover shady content:// paths." into oreo-cts-dev