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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 32f174ab -s ours am: 59704d24 -s ours am: bbe59099 -s ours am: 0820736b -s ours am: 6e378fcb -s ours

am skip reason: subject contains skip directive

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



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