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