Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a90653a300 -s ours am: 9d476e9b45 -s ours" into sc-v2-dev-plus-aosp am: 05778cabcd -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16155522 Change-Id: I95fd87cb06488af4f347f03fd6736d907d0dd5c7
This commit is contained in: