Merge "IP connectivity metrics: fix LINGER/UNLINGER logging" am: e28513f150
am: ec039b943a

Change-Id: I422ef3cd6eab19cf3de2d6d9520840a7597c4a65