[automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: e995acd27e -s ours am: a363cfeed6 -s ours am: 1cbf21556f -s ours
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 821300b5cd is in history
Change-Id: Ibdfe6c78c30026ffbb3133e0f1e1653dc0372700
This commit is contained in: