frc_340819020 (10612203,com.google.android.ipsec,com.google.android.networkstack,com.google.android.tethering)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24201131'] into sparse-10579759-L32300000962295751.
SPARSE_CHANGE: Ic3e2868671b4cc4bf263e81bf9fa5d3e25f4fe79

Change-Id: If7bf636dffe6516c085025d7f634477066abb493