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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 862299ff -s ours am: f0d378a1 -s ours am: 5246dad4 -s ours

am skip reason: subject contains skip directive

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



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