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