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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 01bb5ac4 -s ours am: 40388073 -s ours am: 2ca09fe0 -s ours am: d415653c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 602a8f19 -s ours am: bdb25b95 -s ours am: d188e450 -s ours am: f0b45afc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e73ee771 -s ours am: 946559a6 -s ours am: 31a922f0 -s ours am: 41189635 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82eb35a9 -s ours am: 43867f22 -s ours am: 8be35183 -s ours am: 1a503770 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: bf57a61c -s ours am: b2ab068c -s ours am: 9cf61985 -s ours am: 1960f5a2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c61738b -s ours am: 29ce3a9d -s ours am: a3129ff3 -s ours am: 9516f4ab -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b5981da2 -s ours am: b2490fa8 -s ours am: 988555c0 -s ours am: cab78cdf -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a85c40bb -s ours am: f0c1144f -s ours am: 5eb5485c -s ours am: ccaeb26c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3a6d5854 -s ours am: 375d1f64 -s ours am: 72c46b79 -s ours am: efc48f58 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9642629 -s ours am: 828dd384 -s ours am: 7c708b73 -s ours am: 6c344314 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7bbe8094 -s ours am: d3492fb5 -s ours am: e6f11e59 -s ours am: 4e8e9969 -s ours