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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 304c1d88 -s ours am: 0480de18 -s ours

am skip reason: subject contains skip directive

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



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