[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7e5ec19c72 -s ours am: 31dc13e8ba -s ours am: 84e996debd -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15018832 Change-Id: I16985450b69182751b722850f5d5c7225c08d26d
This commit is contained in: