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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ab3b6131 -s ours am: 1e7d0bcf -s ours am: 80a3042a -s ours am: 5ef2f655 -s ours

am skip reason: subject contains skip directive

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



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