Merge "Bugfix: PIN keyguard is clipped in Car" into pi-dev am: 90101793e5
am: 14fe430904

Change-Id: I68e02822b787c7397117ab6d14e2fe6d1db9b98f