frc_340819020 (10612203,com.google.android.ipsec,com.google.android.networkstack,com.google.android.tethering)
Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ie5714102aa20aa2acf05443653ad0d73b0f101cb