Merge "Made the DrawableWrapper return the right ColorFilter" into pi-dev
am: cf893ac40c

Change-Id: I60a5a5901a2eeb787d4750819130ded347808f8a