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

Bug: 189946434
Change-Id: Icadbb4c5154e2799060a53b1b52b9f0e58b42c96