Merge "DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d am: 9e7bd59457 am: 94b6048c4a" into nyc-mr2-dev-plus-aosp
am: d949aa9afe  -s ours

Change-Id: I5c271fd23c03564165faf10d0d7499ef62325d34