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: 11205c0f -s ours" into tm-dev am: 457668d2 -s ours am: b16305c6 -s ours am: 49c29912 -s ours

am skip reason: subject contains skip directive

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



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