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