Merge "remove persist.sys.usb.config override" into mnc-dev