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

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

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