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