Merge "Merge "Recover shady content:// paths." into pi-dev am: 7402d7611c" into pi-dev-plus-aosp