[automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: dd8bbd4996 -s ours am: d8e86b04d8 -s ours am: 370b580332 -s ours am: 4580583376 -s ours
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 3bf1224afc is in history
Change-Id: Ibd4cd49034f09945604ea9fbcb03143effca85e7
This commit is contained in: