[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 2cae888d17 -s ours am: 66bd3dc20f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12764397 Change-Id: Iedd48d0a41b50824d9cbfe95a075cbe869eb2b28
This commit is contained in: