[automerger skipped] Merge "Fix flaky override unmetered/congested test" am:...

[automerger skipped] Merge "Fix flaky override unmetered/congested test" am: 006d5182 am: cbc7217a -s ours am: 1c94cf8f -s ours am: 8232efc6 -s ours

am skip reason: Merged-In I3ddf3f0fed41d4af3671e4d09de3e44273340a03 with SHA-1 4da81dc7 is already in history

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

Change-Id: I9d7d15e0ec84b688d253b7b171832244b2d7ef8f