Merge "Fix message names in dumpsys network_stack"
am: 3c776e8793

Change-Id: I5431c0a8b981716e02804cb13f5c59f65a89828c