Merge "USB: android: Add support for USB UICC mass storage"