[automerger skipped] Implement proper discovery with subtypes am: b366d24bd5 am: 86b4bc88e7 am: a523431286 -s ours

am skip reason: Merged-In I21367c66534078667718a9b54dfc858b12ba7103 with SHA-1 b366d24bd5 is already in history

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

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