Merge "Unregister NetworkCallback in NetworkStatsManagerTest" into main am: 8d44250440

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

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