[automerger skipped] Merge "Add network agent to enhance NetworkProvider test"...
[automerger skipped] Merge "Add network agent to enhance NetworkProvider test" into rvc-dev am: 6d5be005 -s ours
am skip reason: Change-Id Id494a1697cc1b73e8e56ae585a69faec31c59f52 with SHA-1 dd844059 is in history
Change-Id: I2fc90cbe6f01ba42a6ac47859d07ea3f4da8fb11