Merge "Rename expect* methods that are used in NetworkStatsServiceTest" am: 827dbd9277

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

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