Merge changes from topic "am-828d7b02241a4b7fb76fe599192cd666" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: d096b075 -s ours am: 4ec2421f -s ours am: 92bf26c5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0518e121 -s ours am: 219874c7 -s ours am: 9ce7d5c4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 30f00bc2 -s ours am: 216601ac -s ours am: 8342eeac -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0ad153ba -s ours am: 4387adb5 -s ours am: 961d0536 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 1879356c -s ours am: e89d9507 -s ours am: 6c0bd61b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e7099f7 -s ours am: 308effb3 -s ours am: 3f7fc4f7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 2a295bf2 -s ours am: f02c44d8 -s ours am: b3ab774a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 482d77f5 -s ours am: 5b20f2c4 -s ours am: 9aa0b7fb -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0c118168 -s ours am: fdf64bbb -s ours am: 463c2fde -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 603c640f -s ours am: 2f350572 -s ours am: 61f5f748 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e403bf69 -s ours am: b9acea9e -s ours am: 844a4bea -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 556dc213 -s ours am: 2ac2afba -s ours am: fc44dd44 -s ours