UsbSettings: Fix UMS mode

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