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