Commit 18cb065f 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: 96ec3014 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ice76f3156551cc1a54d423758449bd89c9791c0b

There are no changes