Merge "Revert "Add tests for AdvertisingSet and AdvertisingSetCallback"" am: 22f23e2e67

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

Change-Id: I59918aca0d589c1fca0c0361a05e6b0ec3dbabb5