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

Bug: 189946434
Change-Id: Ife2048bf45ab2d06da9d295da908fc2d8eace381