Merge changes from topic "am-be1b2c1bac4347ebb6462994efbfdb74" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 018259eb -s ours am: adeb3441 -s ours am: 9cc1e5bd -s ours am: fe1eba3a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09e05e31 -s ours am: 25847a01 -s ours am: d3317e5f -s ours am: c70ab8fa -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 4ed0cab8 -s ours am: d1a6a2eb -s ours am: 20c748fe -s ours am: 1416d59c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1fc928d1 -s ours am: bf39743b -s ours am: 61e546a6 -s ours am: a05ed664 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 036891b0 -s ours am: 17e222a9 -s ours am: da63d29b -s ours am: aff26c64 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 46cf83e1 -s ours am: 68568375 -s ours am: a6429d8c -s ours am: aa731822 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3176a577 -s ours am: 6618f9a3 -s ours am: db1c458b -s ours am: fcb89634 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7bb48cd9 -s ours am: 9d6cdbda -s ours am: e9c41edc -s ours am: fb56cc94 -s ours