Restore foreground service notifications

Fixes: 34582788
Test: manual; start a foreground service) and verify notification
appears (here, set an alarm in Clock app)

Change-Id: Ib788cc78c461d2da32ea9abdb11ab384d1d09dd2
(cherry picked from commit 9decd5ab3b2c8d6742c3a4cb10a107fa9cf43afc)
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 4b89b40..1bba7ec 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -707,7 +707,7 @@
         try {
             ServiceRecord r = findServiceLocked(className, token, userId);
             if (r != null) {
-                setServiceForegroundInnerLocked(r, userId, notification, flags);
+                setServiceForegroundInnerLocked(r, id, notification, flags);
             }
         } finally {
             Binder.restoreCallingIdentity(origId);