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-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" into nyc-mr2-dev-plus-aosp
am: 6cb8cff2  -s ours

Change-Id: Ie73e72a71dea3126d6b9f3a7281cb49c0992082a