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

Change-Id: I44535ab5f82948e7c203838aaca7c3999e22aa05