[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f6c0699...

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f6c0699 -s ours am: 715f787c -s ours

am skip reason: subject contains skip directive

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



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