Merge "Update USB dialog for USB-C power option" into mnc-dr-dev