Merge "Adding Metrics/protos in the ConnectivityService" am: 4e8a7d237c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2464234

Change-Id: Ib1f9e034c6f637a8831bf833c3873c0fe530aa56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>