r_aml_301500702 (7687660,com.google.android.networkstack.permissionconfig)
Snap for 6838321 from c12f9b9aa5a87e996f5e69f3988f417aab8dd01b to mainline-release

Change-Id: I284ac11829067f5d0cbfe3cc934af7cef4dafe00