Merge "Update persist.sys.usb.config on runtime" am: 41346e553b
am: ac945881b3

Change-Id: I32d78d88863fdae54663b5177d450a0c8d037ae1