[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 976f702727
-s ours am: 158bf69a42
-s ours am: 4ad699717a
-s ours am: 89fe1313c2
-s ours am: 727d0996d1
-s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205917 Change-Id: I1e34a4b9dda0fd641e1fe34f6a6811ba43fb649e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: