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

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

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

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

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