[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 659a582b89 -s ours am: bf2af250a1 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117096 Change-Id: Iacd61fff3d5dac7bc5257674c33d7ea882999c0b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: