[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 892e3735fc -s ours am: f3a8ecc1d2 -s ours am: 1e094652b2 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1943745 Change-Id: I68f90730b05f403c7d0172a345d21e636ebaafca
This commit is contained in: