Merge "Update persist.sys.usb.config on runtime" am: 41346e553b am: ac945881b3 am: 33e7e21645
am: 01d4504a6c

Change-Id: If1e4279f05d74eccf5ce23eef41a466b7d8e3bde