[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6496ea2e...

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6496ea2e -s ours am: 68dfa1d5 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24916595



Change-Id: Ie87f29266dc58d6c911197c617fff51c43d1bd6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>