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

Bug: 189946434
Change-Id: I4ae1ca81e08698e14cee35187ddf06710a4a3902