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

Change-Id: Ieaf7c94eece46a2d252e508841ea41d9e8384ee1