Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836  -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 5bf382063d am: b09bcc7328" into nyc-mr2-dev-plus-aosp
am: 214b523a6a  -s ours

Change-Id: Ied75877c0a1e1bb73429d7b109a8bca684cdf3d8