aml_net_341610030 (11510160,com.google.android.networkstack)
Snap for 10447354 from cc6af6925e49b0eec754ebfd72eacab2b3dbcab8 to mainline-networking-release

Change-Id: Id35be196b440dff1dfc0ef3da895cf689510ebe6