[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3cac517f -s ours am: 84d9a6f87a -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2614677 Change-Id: I905a290568064975ef67fc92784cdd8959f834c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: