Merge "Remove more extras during notification lightening."

diff --cc core/java/android/app/Notification.java
index 099a5fe,9d5e2f5..e7dd5ff
--- 1/core/java/android/app/Notification.java
--- 2/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@@ -46,9 -46,9 +46,10 @@@ import android.os.SystemClock
  import android.os.UserHandle;
  import android.text.TextUtils;
  import android.util.Log;
+ import android.util.SparseArray;
  import android.util.TypedValue;
  import android.view.Gravity;
 +import android.view.NotificationHeaderView;
  import android.view.View;
  import android.widget.ProgressBar;
  import android.widget.RemoteViews;