Merge "Align badging logic with platform IconDrawableFactory. am: b0be237b3f am: cb07a1c026" into qt-r1-dev-plus-aosp
am: 393d29f9d4

Change-Id: I7ec0904389746e1a7708076e464c25938ce8dede