[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c18be9fcf4 -s ours am: 656dc1ecaa -s ours am: 29e3066ba3 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15322561 Change-Id: I5cd7962b3afe21e8f541fe4ce7affa13099a7260
This commit is contained in: