[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d916565...

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d916565 -s ours am: 24e0008e -s ours

am skip reason: subject contains skip directive

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



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