Merge "Update scrims when keyguard gets occluded" into pi-dev am: cc4efe08de
am: 7c66fae398

Change-Id: I64c0792cbbf4285e33032a4d3517d3529c072ba4