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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 51bce4d5 -s ours am: 4b21cda0 -s ours am: cfc710d7 -s ours am: e9188478 -s ours am: fdb98ee6 -s ours

am skip reason: subject contains skip directive

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



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