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