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

Change-Id: I19579cada6c7505a4691e81e693f1f1cabc45259