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