Merge "Revert "Add tests for AdvertisingSet and AdvertisingSetCallback"" am: 22f23e2e67 am: a4a8c76ecf am: 00d7c12acb am: 446470eca5

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

Change-Id: I078729bf53b220c7fe54825296ad6e6dc34cd08a