Revert query handling of subid

This was enabled by aosp/541366 but is causing a regression in querying
APNs. This CL reverts back to the previous behavior, which does not
handle sub id when querying.

Bug: 74213956
Test: manual and unit test
Change-Id: Id0fed0de44a02f6baa13b6bf1f1c7b2ec8e190ea
2 files changed