[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into...

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 38696b0b -s ours am: 7a2aa9a8 -s ours am: fda73317 -s ours am: 9c7fd76d -s ours

am skip reason: subject contains skip directive

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



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