Fixed an issue where a notification could stay userlocked

With the fingerprint gesture a user could get a notification
into a state where it remained userlocked.
We're now not only cancelling the expand helper when the shade
is collapsed but also clearing all userlocked flags.

Test: runtest systemui
Change-Id: Ibf0b29375242daf627ec9b5233a8720a9c01dbf6
Fixes: 63055586
2 files changed