[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0033ce1b28 -s ours am: 1689cdd1cb -s ours am: a3ccedb3fc -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684929 Change-Id: I2d8dbb303634ff82a0a6b28e85e74bef62152de9
This commit is contained in: