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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2d90c8f1 -s ours am: a1d95472 -s ours am: 6e8e02f1 -s ours

am skip reason: subject contains skip directive

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



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