Implement proper discovery with subtypes am: b366d24bd5

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

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