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

Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e142782 am: a80cbeee am: 44e8914f am: 26f78f58  -s ours am: 99b97e5e am: 398cdb69 am: f00515f4 am: 17d6ba41" into nyc-mr1-dev-plus-aosp
am: a2a069e9

Change-Id: Iade0f5f736c2cce1539117d86ec9483d405b67e8