Merge "init: prevent persist.sys.usb.config initalized as none,adb" into rvc-dev