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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 77f103bc -s ours am: 0a1ebc1c -s ours am: a20ea166 -s ours am: 61041c96 -s ours

am skip reason: subject contains skip directive

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



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