Merge changes from topic "am-69bbabe4aa46467eb85a40ee75080959" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 04aa4987 -s ours am: 46c9a2bd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c47512a -s ours am: 217687d6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9fa8c43b -s ours am: b28e7f45 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff1a9f2b -s ours am: 2bec51b9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 308f47a7 -s ours am: cdec87e2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4f57d2ac -s ours am: 21fddde4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 552ec974 -s ours am: c2e7f8df -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e78bc497 -s ours am: 33546310 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fd6a563f -s ours am: 9db3e77e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9cc7f04 -s ours am: e3433459 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 33276348 -s ours am: f7224949 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecaeb331 -s ours am: 959ecd40 -s ours