Merge "Update persist.sys.usb.config on runtime" into oc-dev
am: 353c6cd3c3  -s ours

Change-Id: I50f2b5b5564f918bd2cbaaa59bdcce1d4ecbc76f