Merge "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" into nougat-mr1-cts-dev
am: 8a330a1a38

Change-Id: Ie2b16b4e45fde6ff323581cd9c764921495d7b9e