r_aml_301500702 (7687660,com.google.android.networkstack.permissionconfig)
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 8638b2a449 -s ours
am skip reason: subject contains skip directive

Change-Id: Ieaf5a74d05186301aa3e99e9f077c70efd824839