[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15331bfdd2 -s ours am: 6a9b64f20a -s ours am: 952f17e022 -s ours am: d5ec66132c -s ours am: 3d2779b8ec -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15873783 Change-Id: Ib69343ee80b3a3b90b4e8836b5c8bc17135416b0
This commit is contained in: