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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b9c02a92 -s ours am: 7b0656ed -s ours am: 0e26cd9b -s ours am: 6b955269 -s ours am: 043ff327 -s ours

am skip reason: subject contains skip directive

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



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