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

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

Change-Id: I7f8a12938c3859dcc6fdc75e79ce1761c33516c8
tree: e7cb8d630ea7a59516de80d110143c002d3fc14c
  1. tests/