r_aml_301500702 (7687660,com.google.android.networkstack.permissionconfig)
Merge "Make license block consistent with the whole package." am: 063e04f971 am: 66c6769847 am: ce33f84daa
am: 80c9aa0ff8

Change-Id: I426af2de2e5449fecba60b62fd6cb0ee4f3071c4