[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0d361b8f53 -s ours am: 6480a4098e -s ours am: 97b00aac14 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419943 Change-Id: I72cde7c0333630d1a15629ff20dc5fdae1ef4015
This commit is contained in: