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 am: 45ba8593c0" into nyc-mr2-dev-plus-aosp
am: 545b2f2083  -s ours

Change-Id: I35712adaaaf8bfb9cdec9d524fdb1b5099986ef7