[automerger skipped] Merge "Add a cancel string for the dialog to handle Tamil...

[automerger skipped] Merge "Add a cancel string for the dialog to handle Tamil translation" am: 7ba3e20a -s ours

am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043033



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