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