r_aml_301500702 (7687660,com.google.android.networkstack.permissionconfig)
Snap for 6981242 from 03a7b1085105cc67f4a01d6f0993e061468ed509 to mainline-release

Change-Id: I109827e1c8f92359b3e44b8fa2156fbb4f698c09