Commit 6480a409 authored Sep 04, 2020 by Treehugger Robot Committed by Automerger Merge Worker Sep 04, 2020

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0d361b8f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8457ec4cfc3e3854d22856a3a37c0126db71d4ee

There are no changes