Fix janky wakeup animation am: c4cf07a16f

am: ad08a8b21d

Change-Id: I3e9c1c9b5983534708ea2a092ed5b7523487f0bf

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
Simple merge

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
index 052e8e1,ff4f215..6fc4911
--- 1/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
--- 2/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
@@@ -42,11 -41,10 +41,10 @@@ import android.graphics.Rect
  import android.os.Bundle;
  import android.os.Handler;
  import android.service.notification.StatusBarNotification;
 -import android.support.annotation.NonNull;
 -import android.support.annotation.VisibleForTesting;
 -import android.support.v4.graphics.ColorUtils;
 +import androidx.annotation.NonNull;
 +import androidx.annotation.VisibleForTesting;
 +import androidx.core.graphics.ColorUtils;
  import android.util.AttributeSet;
- import android.util.FloatProperty;
  import android.util.Log;
  import android.util.MathUtils;
  import android.util.Pair;