[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660
-s ours am: bc60e81eca
-s ours am: 60ec0ad7d6
-s ours am: c50088a5b5
-s ours am: 9b1bc2eeae
-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: I7962b5d4e73bc631178f950f78302725c0a14e76 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: