Frameworks: take notification size into account + cleanup

take notification size as well into account for qs swipe down
feature due it can take effect if the user dismiss a non permanent
one during a permanent one is present. CM bug

as well cleanup redundant code

Change-Id: Ie90ea286719d4a883f717fd546efc59eeb5d4990

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java