Merge "Move `setprop sys.usb.configfs 0` to `on init` action" am: 5183983af2 am: bf06dc17c4

Change-Id: I59ccb01eec03424ec33da314dc92ba2e69e8df9c