frc_340819020 (10612203,com.google.android.ipsec,com.google.android.networkstack,com.google.android.tethering)
Snap for 9912757 from 284c2cd450757d2be2e577303d219a519dd6bab1 to aml-frc-release

Change-Id: Ia8db0257d1a721ffe2f5b3f6549b54f17dbe4f3e