Merge "Add log to NoMan for canceled cancels" into rvc-qpr-dev

services/core/java/com/android/server/notification/NotificationManagerService.java

@@ -6245,6 +6245,8 @@ public class NotificationManagerService extends SystemService {
                     for (NotificationRecord r : enqueued) {
                         if (r.mUpdateTimeMs > mWhen) {
                             // At least one enqueue was posted after the cancel, so we're invalid
+                            Slog.i(TAG, "notification cancel ignored due to newer enqueued entry"
+                                    + "key=" + r.getSbn().getKey());
                             return;
                         }
                     }