aml_pco_311011000 (7685834,com.google.android.networkstack.permissionconfig)
Snap for 7679530 from d2f34ec56e64c71960581dd92971ff92c9916957 to mainline-networkstack-permissionconfig-release

Change-Id: I4322ffbd3fe11a9aab479c93d3668049e3abc56c