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

Change-Id: I96723522febf68029efdf099269c0e4b7d7c149e