Merge "UsbDebuggingActivity.java: OK -> Allow"
am: f9718dbe17

Change-Id: I597e50b031334ff67641f9252d8081fbfca7f4b4