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

Change-Id: I3eb116d4665d5ec098c3eb84971121919e5b5a9e