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

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

Change-Id: I455d07c9968e6d4b7bb8b411de24b1a506203d3a