[automerger skipped] Merge "Remove 5G only workaround for TNM" am: fe3bcab4...

[automerger skipped] Merge "Remove 5G only workaround for TNM" am: fe3bcab4 am: 31e0688f am: 7c9b7d6e -s ours am: d3b892ae -s ours

am skip reason: Merged-In I4e98e1f6cea902c03e012a7603b35969bc0a1a64 with SHA-1 4c2ba07a is already in history

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

Change-Id: I32012d025345cf9fb4beed140de09b9442939264