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

Bug: 189946434
Change-Id: Iae315840f4dac902784fd14ee085f59dd0c7666b