Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1