Revert "ThemeUtils: Retain the original package name in themed UI context"

This reverts commit 9e24b61d784c1e1e7f39d4d78f7d23d523ffb74e.

Change-Id: I3c4ce07916ed4c1cf057b8271029ae240385cdc9
Merge "Revert "ThemeUtils: Retain the original package name in themed UI context"" into 4.4