frc_340818170 (10768146,com.google.android.art)
Merge sc-mainline-prod

Bug: 189946434
Change-Id: I042f3697acb93059ea10aee2078fd8207cb41c1d