Merge "Don't wait for unnecessary disconnect broadcast" am: d074c9ea58

Original change: https://android-review.googlesource.com/c/platform/cts/+/1448359

Change-Id: I67cb90cccdd63a0638f0289bf63d559d20deb87c
tree: 3df31da96c2b8240366a2d4304169d3497acb603
  1. tests/