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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9ac8db44 -s ours am: c27e0819 -s ours am: c90b69d2 -s ours am: 1cba1042 -s ours am: f2b90fec -s ours

am skip reason: subject contains skip directive

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



Change-Id: I5dd37c70234e0d91354e2cc8dbc2cba40eb4e6fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>