[automerger skipped] Merge "Fix the issue to compare operator name" am:...

[automerger skipped] Merge "Fix the issue to compare operator name" am: 2373bd27 am: 388fa622 -s ours am: 0e0419a0 -s ours

am skip reason: Change-Id Ida85d4e5ddbaf37ef83b81a90c5641a7258c5df5 with SHA-1 002672d2 is in history

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

Change-Id: Ia5ae7e42ab4d524652e910bf6ac32fa01a999dbe