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

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

am skip reason: subject contains skip directive

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



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