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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c26cd981 -s ours am: 618bb2b6 -s ours am: f3fd4b54 -s ours am: f1d24fca -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0e3d96185d10415087576c9a5603a4b63419ce85