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

Change-Id: I30c5c07b6b0308e6161607f7e89302d5af8b7c11