[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735bca5320 -s ours am: a14ca941a8 -s ours am: 225c3e8769 -s ours am: f4c5136dbf -s ours am: 02ae041c0e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15875819 Change-Id: I45da72dea9f5ac87283d67456bf20c3669c0e2c6
This commit is contained in: