Merge "adb: Check sender's socket id when receiving packets."