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

Change-Id: Ic13e77dc6b80404d80bfc881358f8c2f921d1bfa