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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: dcbc9110 -s ours am: 9f884357 -s ours am: 9d7a8a08 -s ours" into tm-d1-dev-plus-aosp am: 3e934c83 -s ours

am skip reason: subject contains skip directive

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



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