[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 61c868d07e -s ours am: 96088df10d -s ours am: e49246e73b -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1943418 Change-Id: Ic50e24388224ccf282aa5acb432ee1b47f787cb1
This commit is contained in: