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

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 204ea4a6 -s ours am: 563fe111 -s ours am: 04dfbc14 -s ours am: 63a224ea -s ours" into tm-qpr-dev-plus-aosp am: b5a769f2 -s ours am: efc709d8 -s ours

am skip reason: subject contains skip directive

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



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