[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b4378d894b -s ours am: a944cacb4d -s ours am: 471f7e12b2 -s ours am: 4d6f32e270 -s ours am: 214d028dec -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15691334 Change-Id: I9036d6e51c749e3d4c5a6adbab1cabcbc5024063
This commit is contained in: