Merge "init: prevent persist.sys.usb.config initalized as none,adb" am: 78464a0337

Change-Id: Ib903adce0ac6ed502c595dac670b5c7ec1d84963