[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: eb76dbdafc -s ours am: 1a197c7865 -s ours am: 91d0f0e855 -s ours am: 29b9054a9c -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16155558 Change-Id: I25048ebf607e70d10cd675d79407fb26959dc5b2
This commit is contained in: