[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15331bfd...

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15331bfd -s ours am: 6a9b64f2 -s ours am: 952f17e0 -s ours am: 2d4f9f81 -s ours am: 70d7e197 -s ours am: 7fff5835 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15873783

Change-Id: Ic87b4f8f0d9480c08cd220d186c2372ac3ff9a47