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

Change-Id: I675a902e204a3526a4909080d30d99d9a2a868f8