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