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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 2dac5320 -s ours am: 351ffe24 -s ours am: 6996cfa3 -s ours am: 5f2843d1 -s ours am: 68338838 -s ours

am skip reason: subject contains skip directive

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



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