Commit a3cf33e5 authored Jul 04, 2021 by Treehugger Robot Committed by Automerger Merge Worker Jul 04, 2021

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

am skip reason: subject contains skip directive

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

Change-Id: Ia18dc24d4a0e43448d5e88e65bc91f7be88309e1

There are no changes