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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a74d94dd -s ours am: eea50a1b -s ours am: 30cd97bf -s ours am: ba07fcb4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iffb1b36b8489c5773754c76d13b8948ae01c698a