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