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

Change-Id: I088e5611a7aac1377019cfa09ba81a4ee9a5c83b