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

Bug: 189946434
Change-Id: I474c92d7fe1e29a925ff8cda47649d9a2ae13219