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

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

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