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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0fe4a203 -s ours am: 2a14501b -s ours am: 20f59e50 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d40627d6 -s ours am: 6b02effb -s ours am: 866c6820 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: d84f12ae -s ours am: 2169aabe -s ours am: 5db079c3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4d57745 -s ours am: 7c813422 -s ours am: bcf66d5d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9dfff595 -s ours am: db5dbd70 -s ours am: 75625cf1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11837eda -s ours am: 9448ef30 -s ours am: 6fc75b5e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 1899b464 -s ours am: d6b483b2 -s ours am: 3696393a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9643ff3b -s ours am: 2729a2f1 -s ours am: 578af6d6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bdb5b2b3 -s ours am: a414e50c -s ours am: a1582565 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cf3d3c8 -s ours am: 8b7afaa5 -s ours am: 04e22ba6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c8cd28e6 -s ours am: 81413db6 -s ours am: a6f1cfda -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5bb04ec -s ours am: b6388d36 -s ours am: 0dff42a0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bc04c5bc -s ours am: ea05e83b -s ours am: 12874a57 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b266517 -s ours am: 8a7b0c01 -s ours am: 1c977d58 -s ours