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

Change-Id: I10d850424df8472b25fa9427564dacdddf2b2444