[automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: e995acd27e am: 6df16e5c3b am: 5024143ad7 am: 245d96ec37 -s ours am: a307d090d3 -s ours
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 5a50ac984f is in history
Change-Id: If9129e54639d6faf98b4fd4e6f7dadc2dab15377
This commit is contained in: