[automerger skipped] Merge "Add a cancel string for ToggleSubscriptionDialog...

[automerger skipped] Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation" am: d71406f8 -s ours am: dece9252 -s ours am: 4228fc73 -s ours

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

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



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