[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 230452873e -s ours am: a3d3942140 -s ours am: b17c0b2654 -s ours am: 4739de1147 -s ours am: 20036b9221 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420411 Change-Id: Ibee3f72b08d1ee555b2b5bc77e23bf60c0cd9a06
This commit is contained in: