Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into udc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9f5c4a4b8f -s ours am: 26447f1bff -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c101409246 -s ours am: af1cc12d9e -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b8432338e6 -s ours am: 9f3d0f6d22 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29dfac37de -s ours am: 6f43aa569c -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4793eb6312 -s ours am: f39e9870d1 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 397c3a1463 -s ours am: e237966acd -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a588f16555 -s ours am: 3f9b084d57 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c395692ce -s ours am: f3cf1239b1 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 49f8a34c38 -s ours am: d1337f22c0 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9529715557 -s ours am: 180890ec83 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 97773a0f11 -s ours am: aae9ecfed7 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 118c031be4 -s ours am: 03b7f8d86a -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 43b111d2f5 -s ours am: bbe8b66a90 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1072a5ea1e -s ours am: 8ac0e36456 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d03cf10a2c -s ours am: 183777a7ec -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f20535783f -s ours am: 6045b06d34 -s ours