[automerger skipped] SockDiag - fix a deadcode warning am: 07f03ac1 -s ours am: 4eb5a398 -s ours
am skip reason: Change-Id Ia5ad0ef3176b90915cba6c8a1b8626ead53d67f6 with SHA-1 84b59d9f is in history
Change-Id: Ia133387187945014a1a25e02a454856244c48a67