[automerger skipped] Merge "Import translations. DO NOT MERGE" am: bc1c776824 -s ours

am skip reason: subject contains skip directive

Change-Id: I1fef91a4dbad622ca13e7f218eec2af16f4fc543
tree: 433ba68a80f487c1ecfab89068051ee02c9783ef
  1. assets/
  2. res/
  3. src/
  4. tests/
  5. Android.bp
  6. AndroidManifest.xml
  7. OWNERS
  8. PREUPLOAD.cfg