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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 075f9cee -s ours am: 29e396f6 -s ours am: 3a1f5c8f -s ours am: dcdc8684 -s ours

am skip reason: subject contains skip directive

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



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