Merge "UsbDebuggingActivity: Strings update after review" into jb-mr1-dev