Partial revert "SystemUI: Cleanup and enhance notification drawer header"

this change broke some themes

This partially reverts commit fa928328b54a5fdcdbe63ea4a045858e24c9ca8a.

Change-Id: I98821e5880037c6459d7a618bb2b51f658303d3e