[automerger skipped] Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation" am: d71406f8ee
-s ours
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 eba8857094
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043030
Change-Id: I9484599eba7ddacad002343cd22a9476afecff3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: