[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: e15549a3df -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1684488 Change-Id: Ib11819862bb61a77d8e179d53b80ee24a979923b
This commit is contained in: