Align badging logic with platform IconDrawableFactory.
am: b0be237b3f

Change-Id: I4cb15de478dd232e3f16c00b379b89a921b6d4a4