[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 69cba5cad9 -s ours am: 78a6d7ef3d -s ours am: 7b14203a9f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15915586 Change-Id: I013e1e5bc1783dca8f24632fd45ee1e9ea7a3d74
This commit is contained in: