[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ca8a77ea51 -s ours am: c7901e9194 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12136594 Change-Id: I7c262a79ce327b372356632f7e3085ad446dbe26
This commit is contained in: