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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 422a5dfe -s ours am: 9d8e1f88 -s ours am: 24cb7d9e -s ours am: a47bd5cc -s ours

am skip reason: subject contains skip directive

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



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