frc_340819280 (11225212,com.google.android.art,com.google.android.go.art)
Merge sc-mainline-prod

Bug: 189946434
Change-Id: Iae315840f4dac902784fd14ee085f59dd0c7666b