[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6a2e87fd8f -s ours am: eeadee37f7 -s ours am: c610f9511a -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419994 Change-Id: If5cb5a6219da123c21cc238bcf96fd0c4f37bb26
This commit is contained in: