Merge "Fix querying of multiple subtypes" into main am: 742588457a

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

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