frc_340819280 (11225212,com.google.android.art,com.google.android.go.art)
Snap for 9816131 from 80d653c6bf04c87402fe3ed2b85b8ab5da80519e to aml-frc-release

Change-Id: Ibd932ee52bce53c2ab363d5c389430dfd737232b