Merge "Squash ANRs in UsbStorageActivity." into gingerbread