Fixed a bug where the increased height wasn't applied correctly

The wrong value was used for the increased heads-up and the
increased contentViewHeight.

Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationinflaterTest.java
Change-Id: Ia72b2de890d89d4cffb40eaa653a62f426945451