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