Merge "Removing custom state definition from FastBitmapDrawable" into ub-launcher3-dorval
am: ea53ca3a17

Change-Id: Id326b16aabafa1be2e93f562df3e32008310af9e