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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 08321e32 -s ours am: 86eefff6 -s ours am: f25a8cb2 -s ours am: 3d79006b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1da11eedfe9771744056b1548b94aa3e766d1a72