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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6c3482b1 -s ours am: e7569b86 -s ours am: 1c6a61e7 -s ours am: 0b156317 -s ours am: a4b371d6 -s ours

am skip reason: subject contains skip directive

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



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