[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 96ec301433 -s ours am: 18cb065f14 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755812 Change-Id: Ia457cc698fd4b23b578feca361690974b06bffbd
This commit is contained in: