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

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

Change-Id: Ieaafeb84eeacd51c05266757b0242a963ba36e35