[automerger skipped] Merge "Change NetworkFactory to NetworkProvider in...
[automerger skipped] Merge "Change NetworkFactory to NetworkProvider in telephony." am: d6c2fb6e am: 52757677 am: 4e05716e -s ours
am skip reason: Change-Id I7a662e2cc065e429d5435e81e255d8f1c6603754 with SHA-1 a787adf0 is in history
Change-Id: Ifc099a13b064a8508a5d5e62b73566bfc1497520