frc_350820660 (12261220,com.google.android.go.networkstack,com.google.android.networkstack)
Snap for 11971971 from 2047f11257148c2aaa507ad95b3d3f536b7e5e33 to aml-frc-release

Change-Id: If778ceec27b451789d32551d299bcfbd33b87f9d