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