[automerger skipped] Merge "Remove unnecessary checks for...

[automerger skipped] Merge "Remove unnecessary checks for testOverrideUnmetered" am: bdd55517 am: cfa23f34 am: 591f21cb -s ours

am skip reason: skip tag Change-Id I117d2de06ca82d0450a877a099aa1b9cba224bb0 with SHA-1 9f3a5989 is already in history

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

Change-Id: I9a023cfc6f96c792694c6577ad122fc54bed1ce8