[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 22b9581984 -s ours am: ef85937fb6 -s ours am: 6ad090341f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12330847 Change-Id: Ib35acef370d4a53360ed37d4b5b60daadcb1cfe4
This commit is contained in: