Merge changes from topic "am-c26c85c9b4a5456b914b32f130c3a479" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 20d25ab2 -s ours am: fc702fcd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c5811733 -s ours am: f561b768 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 65205700 -s ours am: 7e0385a2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a29ca23 -s ours am: 873e89ed -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7b201425 -s ours am: b89141ed -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5091276 -s ours am: 593e9342 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 140a5a0b -s ours am: a75878bb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f17e01b1 -s ours am: a5c96f6b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: b120a4c2 -s ours am: 61142e38 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b2021d77 -s ours am: 51194596 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f1655317 -s ours am: 9a513298 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d46b670 -s ours am: 5cd89f78 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3eaa0158 -s ours am: 7d67b450 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 25fa1047 -s ours am: 5d898e67 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 10947543 -s ours am: 5eb46339 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b77bc8c -s ours am: ea949cbb -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: e9bcd180 -s ours am: c88c29c7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f2fe6094 -s ours am: f239a01a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: b56b4159 -s ours am: 28de9dd3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86509e67 -s ours am: bd949739 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 50c765ab -s ours am: 3dba76cf -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca75610c -s ours am: 43274ba1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 52948cce -s ours am: be078638 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5856488d -s ours am: a8f89ec1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 048fff83 -s ours am: 616573ba -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 87072acf -s ours am: 99b0f73f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1c39bf26 -s ours am: 5bdec527 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd7e1f12 -s ours am: 88277e5a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9f1b279b -s ours am: 86627f1b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f14f612 -s ours am: 288acd38 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fcc64997 -s ours am: 5e38df04 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 443a3dac -s ours am: 53359d0c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: cdde20a6 -s ours am: c696b3cd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c89ee52 -s ours am: 45748a86 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 0caf3d5b -s ours am: 7b1c0543 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d68dc356 -s ours am: 0d8d2b18 -s ours