Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1