[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 171b38990e -s ours am: 53130fe166 -s ours am: ed60007b7a -s ours am: f346d4e4b8 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1943419 Change-Id: I62e1c7a9aff4b8d47c2e7800fed26e7bc2a1aee7
This commit is contained in: