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