[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 7dab4a6ffc -s ours am: eea0986ff5 -s ours am: fd6887d1f6 -s ours am: 5b7c7d62db -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16981003 Change-Id: Ie5d1b6cb6c8ef583f5af901ddd4e9a858d5a8b24
This commit is contained in: