DO NOT MERGE Fix IP connectivity metrics tests

So that test assumptions match previous changes in ipconnectivity.proto.

This patch also tags metrics tests with @SmallTest.

Test: $ runtest frameworks-net
Bug: 32561414
Bug: 32198976

(cherry picked from commit 80df43ea)

Change-Id: I8926a92248ac2d46fc78749afc40bc5f0de10878