[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5db7c0028c -s ours am: 097abd5f98 -s ours am: c6ac3642f3 -s ours am: 539f9c66da -s ours am: c83088774c -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420007 Change-Id: Icc2f248067d04527e9625f48e8aeb7ac0fed6c5f
This commit is contained in: