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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7df679c -s ours am: 4e4b695e -s ours

am skip reason: subject contains skip directive

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



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