Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 am: 48313052ab" into nyc-mr2-dev-plus-aosp
am: d1534dc14a  -s ours

Change-Id: I902b6cef1b88e15329d9aa0980de4427c9076aa9