New Theme Engine [6/6]

Replace call to getThemeId with getThemePackageName

Change-Id: I6d83e8f81b1b3e46d10975575f2e3d73b96061d7
Merge remote-tracking branch 'cm/cm-11.0' into HEAD