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: f196c044f3" into nyc-mr2-dev-plus-aosp
am: 05c36cb1ca  -s ours

Change-Id: Iff2218f7a5e2cfb9f42339d91d4cbee6f6f79b49