am f0f4915c: Merge "Fix for testListen" into lollipop-cts-dev automerge: 715fe88

* commit 'f0f4915c9db5e04c1719fe582bedf5743e29c243':
  Fix for testListen