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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ff33c17f -s ours am: 64557dfb -s ours am: f1a0dce1 -s ours am: 4d1f56b0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie2588e14883af4fb43cc6845e2df086b8b81a1d4