Merge "Address linter error in TestableNetworkCallbackTest" am: 25b0aeb2a2 am: 3fd3a926dc

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

Change-Id: If2f871fee7517492083bf0a4c9714f60fcb8123b