Align badging logic with platform IconDrawableFactory. am: b0be237b3f
am: d0993b2b6c

Change-Id: I2b7aad098061976ff512d32d30051cb298011a34