[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into...

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a74d94dd -s ours am: 85dca637 -s ours am: 25c03b6b -s ours am: 4749d87d -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15542674

Change-Id: I4fa6c55f27d0200b223ef937c60c8bb34b0712b6