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

Bug: 189946434
Change-Id: I86da15672ef4961ea4910d2f97e29d67973c5fe9