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

Change-Id: Ieec3c59499c3a3770d92a52866aa324df1ce0473