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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f6c0699 -s ours am: 3a7ae858 -s ours

am skip reason: subject contains skip directive

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



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