am 58b9ee28: am cd75f59f: Merge "Fix deadlock caused by synchronous...
am 58b9ee28: am cd75f59f: Merge "Fix deadlock caused by synchronous setOccluded() method in keyguard" into lmp-mr1-dev
* commit '58b9ee28':
Fix deadlock caused by synchronous setOccluded() method in keyguard