[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 954bd171...

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 954bd171 -s ours am: 15109457 -s ours

am skip reason: subject contains skip directive

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



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