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