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