frc_350820960 (12365824,com.google.android.art,com.google.android.go.art)
Snap for 11786515 from 032bf47ebaa9a35ed63ec95987627f9270034246 to aml-frc-release

Change-Id: I33b5574c1543287f1078a11f0cd693ca644d8954