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

Change-Id: I779465991f0243355d8a1f299c7a391bbb065800