Merge "[DU10]Fix the NetworkCycleDataForUidLoaderTest error" am: 8f5f7a2230 am: 6664edbb78 am: 10cfac9d98

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958910

Change-Id: Ia6010bba3522bd74995b97c05f81a582007ebf32