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