[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 840efa7fde -s ours am: f9e4bc51b5 -s ours am: c55ca622de -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16518042 Change-Id: I5f5fda7d567b6f04021df6052ebe77f9fb6b68d6
This commit is contained in: