[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 131de319c0
-s ours am: cefa2d5659
-s ours am: d93fdfcebe
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521212 Change-Id: I0db7ff2f74332436bc0aa1727bc07ab6df5f3e1f
This commit is contained in: