[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a705672152 -s ours am: 66e6b75f9e -s ours am: 47b723cec0 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15372413 Change-Id: If80d58f2423b511cc6eb4f770e061ab9663dc300
This commit is contained in: