Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am: ab80221a8c
am: 893598cd4b

Change-Id: Idfabe38c9b34fa6414e3f5a9188e917d29f316f2