Merge changes from topic "metrics_cts_tests" am: 57b372aa0f am: f564ba3564

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1398399

Change-Id: I3454c195a9a72d8e360fc3ea1180b31b1730617d