r_aml_301500702 (7687660,com.google.android.networkstack.permissionconfig)
Snap for 6650380 from 712e117152a51486d4e864d9b42000438932717f to mainline-release

Change-Id: Ib4718c115c258bef9457e3c6fe44134701c3068b