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