Merge "Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am: 9f607f4c0b am: 36520c229f" into oc-dr1-dev-plus-aosp