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

Change-Id: Ia94e85f13cdb73acd6c3d8811a8eaccd495a12c7