Fixed an issue where the statusbar was expanded

Since we weren't always updating our state whether
our scrims are visible, we could get stuck in an
uninteractable state.

Test: manual, doubletap on AOD notification
Change-Id: I48eca4f29775578382098cf8be876be09ba037a9
Fixes: 64216359
(cherry picked from commit 8cd80403)