[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 550ca84b5f -s ours am: 592bf18fca -s ours am: 546c75b070 -s ours am: 677c6ab4dc -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16927889 Change-Id: I8b31e0a3957ffd0480743f9a804ea82adc4efe68
This commit is contained in: