Merge "Deprecated IP connectivity metrics system api" am: 6822a558b2 am: db8bc33ea7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I803c8a23c87706976d4d59bf5cb0fd577ec4b0bd