aml_net_341510050 (11481695,com.google.android.networkstack)
Snap for 10447354 from 15838a029369efa6af06a375bf4ace021bd6758b to mainline-networking-release

Change-Id: I79a419fd588ca7b1b4dc2f867aaf4b775b07f829