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

Change-Id: Iaa8fa466561a962d2a0264e40309492e1d5d55d8