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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6900566d -s ours am: bb6a3306 -s ours

am skip reason: subject contains skip directive

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



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