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

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

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