Merge "Do not add 'adb' to persist.sys.usb.config if already there"