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

Change-Id: Iebcdc7ad187bdb5256531cfd14629695c1f6917e