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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a87bdb75 -s ours am: 8e41dcb1 -s ours am: 915d4aa9 -s ours am: fcb78769 -s ours

am skip reason: subject contains skip directive

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



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