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

Change-Id: I0ee79bb9e309cfbf5b5df1ab155849d9246b8310