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