Commit 40668e2e authored Jan 11, 2022 by Treehugger Robot Committed by Automerger Merge Worker Jan 11, 2022

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

am skip reason: subject contains skip directive

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

Change-Id: Ia0e8d792d1128743f57a10ec4fddd270b9551e64

There are no changes