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

Change-Id: I0986a103ac25325c1fcb62ce777517b0eee4f2e0