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" into cw-f-dev am: 2e73db5b am: 0e673a81" into nyc-mr2-dev-plus-aosp
am: 24ce7d65  -s ours

Change-Id: I6a0d73ace014da7566aa868952953390574cda06