Merge "Merge "Merge "AnimationDrawableTest will fail when AnimationDrawable created from cache" into lollipop-mr1-cts-dev am: 44738771c9" into marshmallow-cts-dev am: 5483fb6a0e" into nougat-cts-dev am: fd86d39a38 am: 82f0acfa5f am: 99405f9f45
am: 2a758ad22b

Change-Id: Ic3851254457920abe8a2a88beb462d3fc35ebb8f