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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a588f165 -s ours am: 8bbb5f08 -s ours am: 1e51b1d6 -s ours am: 694bd936 -s ours

am skip reason: subject contains skip directive

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



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