Merge "MountService: Use UsbManager to monitor USB state for mass storage"