Merge "Remove unused IpConnectivityMetrics in CS" am: 996c17498f am: d571fa72e1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64b20b343515f641146780ca9b9ec7bfb4ac586a