[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1c5ae8a124 -s ours am: 1a2962d15b -s ours am: e647298264 -s ours am: dff5a34eed -s ours am: af36a28042 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934956 Change-Id: I856301c2fb5f644762da1e6aa7d43f6c1c425d88
This commit is contained in: