Merge "[automerger skipped] Opportunistic cleanup of NetworkFactory. am: 72364eff71 -s ours am: e27a992eda -s ours" into rvc-d1-dev-plus-aosp