[automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: 69784419af -s ours am: b9bf8efde6 -s ours
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 ff97691273 is in history
Change-Id: I534109a6b808a76ae354627f56dfa5461440faa6
This commit is contained in: