Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes."...

Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfc am: 471812ad am: 46108057  -s ours am: aeeb9c84 am: 8c74832d am: 07ad2a90 am: a75ce3a7" into nyc-mr1-dev-plus-aosp am: 30aca837" into nyc-mr2-dev-plus-aosp
am: c0e91458  -s ours

Change-Id: Iae55b7bc8f4ace84533e7ddfc13b9bb0edd28c98