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

Change-Id: I54ce67321abe0d058920c96298d97e6cc2834b09