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

Change-Id: Idc5f769836a45584ece15d184dc88b914016fdf4