Partially Revert "Fix SystemUI FCs when Lockscreen Notifications are disabled"

This reverts commit c4a55395e8ea0071e3bec674b39cf64b757574fc.

Change-Id: I52260cc0726b9daf821b7e9fab064ac85d4d2ce0