[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5ae81b2084
-s ours am: b5a0cf9253
-s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1534238 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iced1762798a3b2ed8f994e4bab4379b353ae877b
This commit is contained in: