Merge "Update USb preference controller to use the new summary texts." into oc-dev
am: e94ba3b55f

Change-Id: I19479c26fd00d7e356ff109a089c6605261af870