Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9f5c4a4b -s ours am: 26447f1b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1014092 -s ours am: af1cc12d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b8432338 -s ours am: 9f3d0f6d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29dfac37 -s ours am: 6f43aa56 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4793eb63 -s ours am: f39e9870 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 397c3a14 -s ours am: e237966a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a588f165 -s ours am: 3f9b084d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c395692 -s ours am: f3cf1239 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 49f8a34c -s ours am: d1337f22 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 95297155 -s ours am: 180890ec -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 97773a0f -s ours am: aae9ecfe -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 118c031b -s ours am: 03b7f8d8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 43b111d2 -s ours am: bbe8b66a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1072a5ea -s ours am: 8ac0e364 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d03cf10a -s ours am: 183777a7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f2053578 -s ours am: 6045b06d -s ours