Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dbadfc159d -s ours am: b83a12caad -s ours am: 977a08de34 -s ours" into sc-v2-dev-plus-aosp am: e4f1a858e7 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15325196 Change-Id: I02ab581010ea0edab886f8e03cf00ecd172d2264
This commit is contained in: