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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: abf8f61e -s ours am: 4dc3c37b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 609735fe -s ours am: 84344fd7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c5a8bc5 -s ours am: 9592cce2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5641288f -s ours am: 1a87c8ba -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2d643932 -s ours am: 3ff6a27c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f8731304 -s ours am: e078034d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6f6c6d74 -s ours am: 2cc713d2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e150243 -s ours am: ddd63bc0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: faf2d88d -s ours am: 20e7706f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04d6fb1d -s ours am: 1107d3cb -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 66d0429b -s ours am: 86f48d21 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a8b6307d -s ours am: 5d7929ae -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 776e6694 -s ours am: 26b963f5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a654f42 -s ours am: fe19cd91 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ad062b0d -s ours am: e18eea3e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d4cda4e -s ours am: 946ad541 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 79045005 -s ours am: 5b4254de -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 999e0392 -s ours am: f1c7c9b6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a36084b0 -s ours am: 3bcb745e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b64645e7 -s ours am: 9b42d061 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 88caa08b -s ours am: 989004b4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d99c0421 -s ours am: c32eb048 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 413a1518 -s ours am: da818c08 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74547948 -s ours am: 52c734c5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b252aeca -s ours am: c632066a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b616cdd8 -s ours am: 1abf7d5d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 0edeec5c -s ours am: cc9856e8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e8ee2915 -s ours am: 03c884d9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 11cd9d5e -s ours am: e831a720 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4411d9d7 -s ours am: 3d76c563 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 59cd50fe -s ours am: d4c0a7e6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 226a9f7c -s ours am: 72df12fb -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fa97384d -s ours am: f32ca241 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2fe3bc3a -s ours am: 1aadf794 -s ours