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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 548d2f3d -s ours am: 839f370e -s ours

am skip reason: subject contains skip directive

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



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