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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 805ac6e1 -s ours am: 3ba842c5 -s ours

am skip reason: subject contains skip directive

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



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