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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0d7f8ceb -s ours am: 3cf5a960 -s ours am: 94c8e5b2 -s ours am: 1f1e6071 -s ours

am skip reason: subject contains skip directive

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



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