[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 679c657122 -s ours am: f6374c6bec -s ours am: da19a9eeec -s ours am: 57e3cf1042 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684653 Change-Id: Ib58079ff1d7eab4dbcee90117004ae97810cc0c9
This commit is contained in: