Commit 975541d9 authored Apr 22, 2021 by Treehugger Robot Committed by Automerger Merge Worker Apr 22, 2021

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

am skip reason: subject contains skip directive

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

Change-Id: Ib6d35e5bf97a186da9fb918566b4d26b0f1cac17

There are no changes