am b556e58b: am 1564a126: am 715fe887: Merge "Fix for testListen" into lollipop-cts-dev

* commit 'b556e58b6d8f79c8508eb3ad4c3b26c608050da5':