r_aml_301500702 (7687660,com.google.android.networkstack.permissionconfig)
Merge stage-aosp-master into pi-dev-plus-aosp
am: 2df736e95a

Change-Id: I8cd636bc162782c31f10e8b6d2a8d226ebfab076