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
am: 189b0adbd2

Change-Id: Iaf1ea91ef1fa48001a55ba9a71b271c8a99bb4b1