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" into nyc-mr1-dev-plus-aosp am: ed09e677
am: 9397f3c3  -s ours

Change-Id: Ia27daa943c2487d886f75af647086d094eef8c20