[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 38735bca27 -s ours am: 7d6d2761df -s ours am: 2276d02b22 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420248 Change-Id: I3325164b31b11d86f52f62348b775374ad920f4b
This commit is contained in: