Merge "Mark UsbHostManagementActivity as distraction-optimized."