[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 638d1924ed -s ours am: 928b1e8347 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14778960 Change-Id: Ic1aab401213f57dc2492e6d39e7903cc7a9a23f0
This commit is contained in: