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

Bug: 189946434
Change-Id: I2ae5b5cfc5b3a6acdbe5fba8a9fd5143f11c6626