[automerger skipped] Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId" into sc-dev am: 97e90536a8 -s ours

am skip reason: Merged-In Id4ae06840e1749997e970b8f1ec391060967bd47 with SHA-1 a0592d3e06 is already in history

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

Change-Id: I7e8fa47946e8682c38fc0b0d1fd4e7aae9967a36