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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1b181721 -s ours am: f3f6b537 -s ours

am skip reason: subject contains skip directive

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



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