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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 14a18a67 -s ours am: 754b7df9 -s ours am: a8bdf9c0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie61debb77cf7ed38fc70cdf8a45e06a0cfdefc7b