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

Change-Id: I0ca728d46b59de754b5aa591fb09a89ab99e13d5