[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 72ad337352 -s ours am: 9e1e819f81 -s ours am: 2beaafda59 -s ours am: e34ba8cb4e -s ours am: 677e33de59 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420420 Change-Id: Icc88093d2dabe650d3db013b2616d55181abb9d6
This commit is contained in: