[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: ba77d3c1 -s ours am: 3ab3d6be -s ours

am skip reason: subject contains skip directive

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

Change-Id: I990c1df77e9348df61ea09d8db45bbff4ce3fcb7