[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6c957ab...

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6c957ab -s ours am: 90d2aae9 -s ours

am skip reason: subject contains skip directive

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



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