[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161 -s ours am: a4bfe8a50f -s ours am: 2d241c544d -s ours am: 52b60555b5 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420392 Change-Id: I4f9a4a3b1daa382df98a7e59d99137767835c2a2
This commit is contained in: