[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: d5010768 -s ours am: 502f3f90 -s ours am: b2c9ba11 -s ours am: 35c9800d -s ours am: ea1cf31c -s ours

am skip reason: subject contains skip directive

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



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