[automerger skipped] Merge "Revert "Fixed that OK button is not localized"" am: 4895135e54 -s ours am: 103eefe9e9 -s ours am: b0b807f717 -s ours am: 8adc76cf47 -s ours

am skip reason: Merged-In Iaccf51e669dbf76ae4c9fcf149cec665f9090c97 with SHA-1 07666003e2 is already in history. Merged-In was found from reverted change.

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2464552

Change-Id: Ic77c77d10ab8f8cd00c1a18bc940eb6bb10a0543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>