[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24fa4abe...

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24fa4abe -s ours am: e896d2f1 -s ours

am skip reason: subject contains skip directive

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



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