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

Change-Id: Iddf617784c20bfd835413e934071aea3b02d5d6c