[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am:...

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8d9e8ba8 -s ours am: 47c1d3f7 -s ours am: 89a0cae9 -s ours am: d8bbffa1 -s ours am: b0cd3fe5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I56719b5ebdf0983d73fd1f26687001733fafa1d8