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

Bug: 189946434
Change-Id: Ie5714102aa20aa2acf05443653ad0d73b0f101cb