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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29685d41 -s ours am: 2a7bb116 -s ours

am skip reason: subject contains skip directive

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



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