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