Merge "Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler"