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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6904a7d -s ours am: 6d549f75 -s ours

am skip reason: subject contains skip directive

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



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