[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 13fdf59374 -s ours am: e901fdc011 -s ours am: 91c6fd686c -s ours am: f9e3b25918 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590977 Change-Id: I68a4aefd1f5d4cce8c9f32974e8dc8c911d5b64e
This commit is contained in: