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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 69aa73ae -s ours am: 25595d47 -s ours

am skip reason: subject contains skip directive

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



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