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