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

Change-Id: Iac9f9e9193faaeafdba420c56f5634ba688202bc