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

Change-Id: Ifb4911e1077f8c673052918fcd4a49e1ab7708d2