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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 22e7f93c -s ours am: e635f684 -s ours

am skip reason: subject contains skip directive

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



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