Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev am: 7e8fc05295 am: 66a7dc6193 am: a03792fb24
am: f2c9eea7ec

Change-Id: I705df5eea2e1efdc5fbcabbff95c56b28ff278d4