[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bd70940a6a -s ours am: 2b4e7af087 -s ours am: 5318845f3c -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15372731 Change-Id: I2923946a35b0fbe13abd62cdaf3965de73321781
This commit is contained in: