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

Merge "Merge "DO NOT MERGE: Check provider access for content changes. am: 4ddbf942 am: 190e20c2 am: 74b36307 am: 4ad17782  -s ours am: c067e76b am: 0891ca2f am: 12b2f8a2 am: 71e42819" into nyc-mr1-dev-plus-aosp am: 2bfad25b" into nyc-mr2-dev-plus-aosp
am: 0c7267b6  -s ours

Change-Id: Id7d6b94ee0c175697e5485c5cdc4354bdc23eb6b