Themes: Map themed icon to app after upgrade

Before this patch, applying an icon theme and then upgrading an app would
cause the app to lose its themed icon.

Change-Id: Ia76a33d0fb731720aa735e9dd9596bc5d2e75d9f
Merge "Themes: Map themed icon to app after upgrade" into cm-11.0
Saunalahti considered non-roaming on Elisa

Change-Id: I51b554cf578c6027d52ad6e111e41d269c1f579f
Tele2 considered non-roaming on T-Mo

Change-Id: Ibb05f277b701861b8716168b54e96f63127e686d
Merge "Saunalahti considered non-roaming on Elisa" into cm-11.0
Merge "Tele2 considered non-roaming on T-Mo" into cm-11.0
Merge pull request #1 from CyanogenMod/cm-11.0

u