[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5cadaf83db -s ours am: 1438e6df82 -s ours am: 6f6a5e1c85 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419988 Change-Id: I8c66a7a2f6a2e9bf226833e7715b77961b94b3db
This commit is contained in: