Merge "init: usb: disable usb function switch until adbd is ready" am: 2a26c2a836
am: b61ecb5213

* commit 'b61ecb5213e1c94e823f23d7f5a8a0a93db617d6':
  init: usb: disable usb function switch until adbd is ready

Change-Id: I5fc733ee946b4d0accf58f56c80270f9e13d9f63