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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6afd64ad -s ours am: 9a12f631 -s ours am: d7b97014 -s ours am: 0f08bb95 -s ours

am skip reason: subject contains skip directive

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



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