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

Change-Id: I11040b64e20d495c94cc3a9ab67c9bc31da76997