Merge "USB: Fix NPE that occurred when restoring default function in UsbManager.setEnabledFunctions"