[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 0d780d5eb0 -s ours am: 7cf6a47050 -s ours am: 5a0d21f262 -s ours am: f0549de43e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12961324 Change-Id: I5bedfd33bf7cce5cb3bc857d93587e39e8bd0ade
This commit is contained in: