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

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

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