Merge "Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev am: 7fc88ac214 am: c91da73326" into nyc-mr1-dev-plus-aosp
am: f223d7e221
* commit 'f223d7e22184a1c4036d854f5465023dd06ee777':
Change-Id: I5df62ee7141c90e13390f96c21ac0013b20a730b
This commit is contained in: