frc_340821000 (10681524,com.google.android.go.tzdata5,com.google.android.tzdata5)
Merge sc-mainline-prod

Bug: 189946434
Change-Id: I042f3697acb93059ea10aee2078fd8207cb41c1d