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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 945049d9 -s ours am: a2325c02 -s ours am: 45c8919e -s ours am: 3776c40b -s ours am: c63b355a -s ours

am skip reason: contains skip directive

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



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