aml_art_340915060 (10774978,com.google.android.art)
Snap for 10453563 from 8ba1f2a396881322a76c552b2b30bb67b5d6da55 to mainline-art-release

Change-Id: Ida20d37e848d8a1465b737bb307f9ee7108a9b63