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

Change-Id: I53f230e3f9b6aa18c7d8d2ff41542fbd47c3da5c