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