UsbSettings: Fix UMS mode

Change-Id: I5ccfcaf945bb4de929f007956dafcc551999739d
Protected Apps: Show state by component instead of by app

Change-Id: Idbe1d69b376fc3f42980404d9448152f606e7f8e
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0