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