Merge "Merge "AnimationDrawableTest will fail when AnimationDrawable created from cache" into lollipop-mr1-cts-dev am: 44738771c9" into marshmallow-cts-dev
am: 5483fb6a0e

Change-Id: I8b9195c1a48d0799ebbeef538328e93ad1469d36