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