Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27  -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e" into nyc-mr1-dev-plus-aosp am: fb9a16a3f3
am: 84938307a9  -s ours

Change-Id: I27d9fc94ea345cf8481295efab717ceb552b3177