Clean up protected apps code (2/2)

- Work with actual component names instead of converting them between
  ComponentName and String all the time
- Some misc. coding style adaptions

Change-Id: I7401ea471d618936e880e6d542744f80f89ce40f
Merge "Clean up protected apps code (2/2)" into cm-11.0
Merge branch 'cm-11.0' into kk_mkt