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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 006ce55f -s ours am: b2fc50c9 -s ours am: ef8acca5 -s ours am: 64013cf6 -s ours

am skip reason: subject contains skip directive

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



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