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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 9ffe7fd0 -s ours am: 00bfbdff -s ours am: e9785c53 -s ours am: 3304163c -s ours

am skip reason: subject contains skip directive

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



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