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

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

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