Merge "Merge "Fixed a bug where the scrim could flash black when snoozing...
Merge "Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev am: 7fc88ac2 am: c91da733" into nyc-mr1-dev-plus-aosp
am: f223d7e2
* commit 'f223d7e2':
Change-Id: I5df62ee7141c90e13390f96c21ac0013b20a730b