[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: dd762a1325 -s ours am: 646f400c75 -s ours am: ecb1fe70ab -s ours am: 51987b1c2b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16855951 Change-Id: I23d20c5b57dabac2817621eb652378abe4b62808
This commit is contained in: