Merge "Fix flaky override unmetered/congested test" into sc-dev am: 8d1dbe67

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/13790249

Change-Id: I64d7e57661e1441124281c1a6b42d3df7b0775dd