[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 53adc95e23 -s ours am: 2d710cdf29 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15751054 Change-Id: I4d3d15c7adaefa13b42d7ba45eb5f7579bb1d066
This commit is contained in: