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

Bug: 189946434
Change-Id: Ic028cd09c1c747e79cd7535a549c8fdca8309a80