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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 25e90a4f -s ours am: 987a5a9b -s ours

am skip reason: subject contains skip directive

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



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