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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3a075dee -s ours am: e870f7c2 -s ours am: b92c3de5 -s ours am: 7b86cdeb -s ours am: ca963a1f -s ours

am skip reason: subject contains skip directive

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



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