[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7b26ef1fb6 -s ours am: 49a17ddcfd -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539149 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8f69f39f23f5a120686226cb19d9a7fa48fbfc08
This commit is contained in: