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

[automerger skipped] Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" am: 02db0438 -s ours am: 5dea8d56 -s ours am: 83a12cf2 -s ours am: 86ab18c4 -s ours

am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3 is already in history. Merged-In was found from reverted change.

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



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