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