[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1d984e1667 -s ours am: e24fa53063 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15600215 Change-Id: I6a078211cf1407b1f41cc276429e27eb77f17759
This commit is contained in: