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