am 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev

* commit '99df2376a161d1a1328b64dfd2451aeb2c50e532':
  Fix Usb-C dialog issues