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