[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a0d9ef7e -s ours am: 2e0c1a0555 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543339 Change-Id: I5a4670a55085e39e44a5b6464aa56a84edf8d97a
This commit is contained in: