[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 204c9c38 -s ours

am skip reason: subject contains skip directive

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



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