am: c5804afa * commit 'c5804afa': Fix a few issues with occluded Keyguard Change-Id: I0e805ee2b7cf37b60b08f951bf1e0e4fdde93464