[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660
-s ours am: b71dd78a86
-s ours am: cd8e1c9e26
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671 Change-Id: I94bd2f1f6f0f60a10d1c0f3e12367d59329c6885 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: