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

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

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