[automerger skipped] Use NetworkProvider in NetworkFactory. am: 2df761bdcb am: 457137406a am: af91e2951d -s ours
am skip reason: Change-Id Ib8cac2fab5092c99b0a496fdeedfcfab6d578936 with SHA-1 a28c5c928a is in history

Change-Id: I8e23dc409be68b3b766c6324908adff568171cd5