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 am: 0af2fdee40" into nyc-mr2-dev-plus-aosp
am: 89ecf83fa6  -s ours

Change-Id: I01a9ae19bc9ae3d1eed5285f47fff4d5c8f9fa9e