Implement proper discovery with subtypes am: b366d24bd5 am: 86b4bc88e7

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

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