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