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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ee117b1f -s ours am: ebf61eaa -s ours am: f7ebae65 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I58cec2e755062090b8e4c19e280230a4db023783