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

Change-Id: Ie8b426c14fa30b7c2f5eadc5818e1dfd16f8c0a5