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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: edcd330f -s ours am: 6270e0e8 -s ours

am skip reason: subject contains skip directive

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



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