Merge "DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a  -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969" into nyc-mr1-dev-plus-aosp am: 2bfad25b06
am: 3d83246be3  -s ours

Change-Id: Ia691ca2f22e62a2a3fa775eeaff1cb38e10178b4