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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f825b7e8 -s ours am: 105c3d7c -s ours

am skip reason: subject contains skip directive

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



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