[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3520f7482a -s ours am: a780c8afe5 -s ours am: 4648c36c57 -s ours am: 665f358efc -s ours am: d8e1470bd5 -s ours am: 85f25c32a4 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15875815 Change-Id: I5e60b9300eed2b9aa7e95c05c0e02d78e9970f79
This commit is contained in: