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

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

am skip reason: subject contains skip directive

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



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