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

Change-Id: Id1d6dfe8fd3a1553fae50601435b50e8746a7565