[automerger skipped] Merge "Don't record network name in metrics log" am: 94de47bc0e am: 0891302f57  -s ours
am: 7bf6e1c51d  -s ours

Change-Id: I50a511029378b130fe9378cce93b9033b45537c1