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 1fb81a644e6a3787ab5bb80ad1a7cb58be62b636)

Change-Id: I8926a92248ac2d46fc78749afc40bc5f0de10878
2 files changed
tree: b348825a673267910b56bfeeb17062403f7a25d6
  1. core/
  2. services/
  3. tests/