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

Change-Id: I1cea2e7016ec5a1bf3b3411d7cbb389db150aeef