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

Change-Id: Ie404c1d61ff517fd9d0d2aa0454a6939b6ce9cd5