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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fb393ff9 -s ours am: 6041ebdd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db8e8c53 -s ours am: 4f69d4bc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7503f46d -s ours am: 9298453c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 83f0b704 -s ours am: adbd9b02 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 876a5062 -s ours am: a8c456a1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4fcff4b -s ours am: a35baa2c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 865ac3bc -s ours am: e4f87b6f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 89812a9a -s ours am: 058b5d87 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 49dd4d9c -s ours am: a52e7efd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60d4b310 -s ours am: e360fc9e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: cd165803 -s ours am: 181af61c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a0b8783 -s ours am: b3c2285b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 521ee620 -s ours am: 9f68d564 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9ce1b741 -s ours am: 01884e26 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 955ceede -s ours am: 2da4d18f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d7eba5df -s ours am: f07e7ded -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f7ba222 -s ours am: a998b955 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a060f68 -s ours am: 33f4fd11 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 27c407e2 -s ours am: 85c8cf42 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bdac1455 -s ours am: af906995 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1d56d3e4 -s ours am: 2cad87f3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1a2ad77 -s ours am: 2a32fc77 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 883cb3f0 -s ours am: 7b5e7a83 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 40906275 -s ours am: b6ca0a1e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 770a6590 -s ours am: 45326424 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6622461 -s ours am: 77507ffe -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 39c1deba -s ours am: 680115ba -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9e05b48 -s ours am: 99a9e224 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: e03de698 -s ours am: 63d5cf98 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 914f58f3 -s ours am: d038c8e4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fdf5b94e -s ours am: 36fe3478 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f9747a4 -s ours am: ba2f4e94 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f590909f -s ours am: 8880f8cd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa5d3a9c -s ours am: 96744713 -s ours