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