Merge changes from topic "am-340505ec150944a9b88ef5fcec38b52a" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 0e7e53e8 -s ours am: a3b7ba81 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1efe0b4 -s ours am: f5fd7766 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 226302d0 -s ours am: 82c79aba -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9783f09 -s ours am: 08ce9627 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a1f7457e -s ours am: 38e8d160 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5896afd -s ours am: 085d398b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d2a0a8d3 -s ours am: a5423df2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99938cce -s ours am: b0b5457a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9292a63f -s ours am: d7b612a2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4991792e -s ours am: 08e95ca9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c98d4d7 -s ours am: 48ff1b21 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f6c0699 -s ours am: 3a7ae858 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 0a3e2c80 -s ours am: d1ebf5b2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fc5f8b1 -s ours am: a1103a2c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: e034ac71 -s ours am: 3bd75988 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c4c343e3 -s ours am: bd3995bd -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb62b748 -s ours am: 6b6df5fe -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e1e099e -s ours am: efbaf840 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f9238c40 -s ours am: 137840aa -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f644931c -s ours am: 9ca80f17 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a1e599a6 -s ours am: 86d89613 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74518b5f -s ours am: 20899a95 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3980123b -s ours am: 9a8b676e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29685d41 -s ours am: 9b77682b -s ours