r_aml_301500702 (7687660,com.google.android.networkstack.permissionconfig)
Snap for 6470414 from dde1f798dc5758bd96c2b0613a2fe0940249c9f0 to mainline-release

Change-Id: I5103640f564e329cd2cde0b4a4931e8650e84317