Merge changes from topic "am-bffb9ddeb0de4c15a168076e3071b9c6" into udc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f151f3c58c -s ours am: 894541f28f -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adf56a965e -s ours am: 37d33eb7d0 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a87bdb750f -s ours am: 00f9b18328 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d471bc6785 -s ours am: b940dd8e9d -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2580a0e607 -s ours am: 80bc8c8c10 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b2ad74a17 -s ours am: 2249a15a55 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: e8dac56b40 -s ours am: 58c78c878a -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3261e0f431 -s ours am: 8b704ec1d4 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: cf3b7c84ec -s ours am: ac3941f896 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1486dda571 -s ours am: 38ce36162e -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c56618da35 -s ours am: 8d5aadd308 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 385d6d56f7 -s ours am: 4618972316 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85801b6f97 -s ours am: 2c685f4769 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4c317930ef -s ours am: 564b674977 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6e36265d3a -s ours am: 6cc0420b79 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3042710cd8 -s ours am: 535c8c116c -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 013fb5d271 -s ours am: 8aaa29e40d -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e71b710926 -s ours am: 42cd58758a -s ours