Android 7.1.1 release 4
Import translations. DO NOT MERGE am: 5403c74434  -s ours am: 0d92f75de4  -s ours am: 29bbea374c  -s ours am: 2d0cac8d0c  -s ours
am: d67cd7d757  -s ours

Change-Id: I1bcc78253cccfdd2f44b014e5002be8d997a27b7