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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a87bdb75 -s ours am: 00f9b183 -s ours am: 47d71b43 -s ours am: 4c45b3fe -s ours

am skip reason: subject contains skip directive

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



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