Commit 155d1092 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: 96d21505 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib89b3c2f8a1371d7f7ccae2b3a20b3d5ce3677d8

There are no changes