r_aml_301500702 (7687660,com.google.android.networkstack.permissionconfig)
Snap for 6698269 from 607e803ac415454fa3ccbf3cd3c7719463195a38 to mainline-release

Change-Id: I666fcbec9562f6fdc1fe65016ab9c0378dc9ce94