Android S V2 Preview 1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e0e4d25b59 -s ours am: a65a6f718d -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/1755751

Change-Id: I2b80c8d2f162c2789b684dff817cfe70f313d281