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: I01aaf966c5ea7eeb059371418d10ed4f7edcbe06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>