[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: acc37353d7
-s ours am: 220ba05109
-s ours am: a0a5760ff9
-s ours am: 16f3036c4b
-s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1684488 Change-Id: I42acb88a6fe3ea4c0225f41b425282b3d3f18487
This commit is contained in: