[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 326a08ee7d -s ours am: d5b49f996b -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420156 Change-Id: I28f52b64c971ae9549b26e02f5528f45d62107c4
This commit is contained in: