[automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: dd8bbd4996 am: 306f1d6506 -s ours
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 7192912f3e is in history
Change-Id: Ie821930a73bb513ff59fb1dde962caff5e36d779
This commit is contained in: