Merge "Fix TestNetworkTracker on Q" am: 9617402272

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2116497

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