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