Merge "Add test for subtype discovery/advertising" am: bf7a24833f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2586608

Change-Id: I10d2bb5314935a9989519ba9567acf6d99907c7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>