[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2b348a40ae -s ours am: e908f88308 -s ours am: e18a6f61b1 -s ours am: c4b02736dc -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684410 Change-Id: Ic38eb1540e6ca5b8e92cc36a8f0d93813e2b87c0
This commit is contained in: