frc_340819280 (11225212,com.google.android.art,com.google.android.go.art)
Snap for 9912757 from 284c2cd450757d2be2e577303d219a519dd6bab1 to aml-frc-release

Change-Id: Ia8db0257d1a721ffe2f5b3f6549b54f17dbe4f3e