Merge "adb: retry install_listener for a while." am: 2361ab0d31
am: 6f37e54508

Change-Id: I73e04b9035bcc4ebbdef71f2ea611d7675c317fd