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