Merge "Stop USB Debugging authorization window dismissing on tap outside."
am: 1b817b81fd

Change-Id: I694dbdb524c2ec61c18ee97769abeaeb7e3b70d7