Align badging logic with platform IconDrawableFactory.
am: b0be237b3f

Change-Id: I1bcd1206b7fe0d4a2b53f332ab47985961215cff