[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 skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420007 Change-Id: I3ec579c9c49125ef9ac8436e37b56d3cf40a427a
This commit is contained in: