UsbSettings: Fix UMS mode

Change-Id: I5ccfcaf945bb4de929f007956dafcc551999739d
Merge remote-tracking branch 'upstream/kk4.4' into kk4.4