Commit 9e1e819f authored Sep 05, 2020 by Treehugger Robot Committed by Automerger Merge Worker Sep 05, 2020

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

am skip reason: subject contains skip directive

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

Change-Id: I4b2284fdf472c87d4eede2d2fa4af2d1e2839877

There are no changes